From 799aa4f1a29d04f9fc8477f9b6fab3a30e8de41a Mon Sep 17 00:00:00 2001
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Fri, 25 Feb 2011 05:45:21 +0000
Subject: [PATCH] --- yaml --- r: 237477 b: refs/heads/master c:
 52bc97470e22e67f11b054e51a31eee100ef6867 h: refs/heads/master i:   237475:
 aacd645b505189288a68cf1c29c16ce456bdfa00 v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_api.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cdf81600b015..5a2ed7ac4084 100644
--- 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
index 150741579408..7490f3f2db8b 100644
--- 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