OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ddc3731
)
sched: protocol only needed when CONFIG_NET_CLS_ACT is enabled
author
Hagen Paul Pfeifer
<hagen@jauu.net>
Fri, 25 Feb 2011 05:45:21 +0000
(
05:45
+0000)
committer
David S. Miller
<davem@davemloft.net>
Fri, 25 Feb 2011 22:00:23 +0000
(14:00 -0800)
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_api.c
patch
|
blob
|
history
diff --git
a/net/sched/sch_api.c
b/net/sched/sch_api.c
index
1507415
..
7490f3f
100644
(file)
--- a/
net/sched/sch_api.c
+++ b/
net/sched/sch_api.c
@@
-1672,12
+1672,12
@@
int tc_classify(struct sk_buff *skb, struct tcf_proto *tp,
struct tcf_result *res)
{
int err = 0;
- __be16 protocol;
#ifdef CONFIG_NET_CLS_ACT
+ __be16 protocol;
struct tcf_proto *otp = tp;
reclassify:
-#endif
protocol = skb->protocol;
+#endif
err = tc_classify_compat(skb, tp, res);
#ifdef CONFIG_NET_CLS_ACT