From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Fri, 25 Feb 2011 05:45:21 +0000 (+0000)
Subject: sched: protocol only needed when CONFIG_NET_CLS_ACT is enabled
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=52bc97470e22e67f11b054e51a31eee100ef6867;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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,
 		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