---

yaml --- r: 237477 b: refs/heads/master c: 52bc974 h: refs/heads/master i: 237475: aacd645 v: v3
git-mirror · Feb 25, 2011 · 799aa4f · 799aa4f
1 parent a5ec655
commit 799aa4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddc3731fcb712646e4a0f8e6117af6a153e9d36f
+refs/heads/master: 52bc97470e22e67f11b054e51a31eee100ef6867
diff --git a/trunk/net/sched/sch_api.c b/trunk/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