Message ID | 1298648721-3026-7-git-send-email-hagen@jauu.net |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Hagen Paul Pfeifer <hagen@jauu.net> Date: Fri, 25 Feb 2011 16:45:21 +0100 > Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net> Applied to net-next-2.6 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net> --- net/sched/sch_api.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)