diff options
author | Hagen Paul Pfeifer <hagen@jauu.net> | 2011-02-25 00:45:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-25 17:00:23 -0500 |
commit | 52bc97470e22e67f11b054e51a31eee100ef6867 (patch) | |
tree | 46989e54ccf26090049482996d21af05c0db8aeb /net | |
parent | ddc3731fcb712646e4a0f8e6117af6a153e9d36f (diff) |
sched: protocol only needed when CONFIG_NET_CLS_ACT is enabled
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/sched/sch_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 150741579408..7490f3f2db8b 100644 --- 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, | |||
1672 | struct tcf_result *res) | 1672 | struct tcf_result *res) |
1673 | { | 1673 | { |
1674 | int err = 0; | 1674 | int err = 0; |
1675 | __be16 protocol; | ||
1676 | #ifdef CONFIG_NET_CLS_ACT | 1675 | #ifdef CONFIG_NET_CLS_ACT |
1676 | __be16 protocol; | ||
1677 | struct tcf_proto *otp = tp; | 1677 | struct tcf_proto *otp = tp; |
1678 | reclassify: | 1678 | reclassify: |
1679 | #endif | ||
1680 | protocol = skb->protocol; | 1679 | protocol = skb->protocol; |
1680 | #endif | ||
1681 | 1681 | ||
1682 | err = tc_classify_compat(skb, tp, res); | 1682 | err = tc_classify_compat(skb, tp, res); |
1683 | #ifdef CONFIG_NET_CLS_ACT | 1683 | #ifdef CONFIG_NET_CLS_ACT |