|
@@ -1672,12 +1672,12 @@ int tc_classify(struct sk_buff *skb, struct tcf_proto *tp,
|
|
struct tcf_result *res)
|
|
struct tcf_result *res)
|
|
{
|
|
{
|
|
int err = 0;
|
|
int err = 0;
|
|
- __be16 protocol;
|
|
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
|
|
+ __be16 protocol;
|
|
struct tcf_proto *otp = tp;
|
|
struct tcf_proto *otp = tp;
|
|
reclassify:
|
|
reclassify:
|
|
-#endif
|
|
|
|
protocol = skb->protocol;
|
|
protocol = skb->protocol;
|
|
|
|
+#endif
|
|
|
|
|
|
err = tc_classify_compat(skb, tp, res);
|
|
err = tc_classify_compat(skb, tp, res);
|
|
#ifdef CONFIG_NET_CLS_ACT
|
|
#ifdef CONFIG_NET_CLS_ACT
|