diff options
| author | Hagen Paul Pfeifer <hagen@jauu.net> | 2011-02-25 05:45:21 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-25 14:00:23 -0800 |
| commit | 52bc97470e22e67f11b054e51a31eee100ef6867 (patch) | |
| tree | 46989e54ccf26090049482996d21af05c0db8aeb /net/sched | |
| parent | ddc3731fcb712646e4a0f8e6117af6a153e9d36f (diff) | |
| download | kernel_samsung_smdk4412-52bc97470e22e67f11b054e51a31eee100ef6867.zip kernel_samsung_smdk4412-52bc97470e22e67f11b054e51a31eee100ef6867.tar.gz kernel_samsung_smdk4412-52bc97470e22e67f11b054e51a31eee100ef6867.tar.bz2 | |
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/sched')
| -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 1507415..7490f3f 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, 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 |