diff options
| author | Mark Brown <broonie@kernel.org> | 2019-01-29 12:04:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-01-29 12:04:54 +0000 |
| commit | d7c26e63cf78fef01d66ae848184c6ee5f4b8bbf (patch) | |
| tree | 3765745a38a7ae1a4a3a056dfc6c736e4c99271d /net/sched/cls_api.c | |
| parent | a8233b6c1972e1959cf84a021aeb61ddcd23cc26 (diff) | |
| parent | f17b5f06cb92ef2250513a1e154c47b78df07d40 (diff) | |
Merge tag 'v5.0-rc4' into asoc-5.1
Linux 5.0-rc4
Diffstat (limited to 'net/sched/cls_api.c')
| -rw-r--r-- | net/sched/cls_api.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 8ce2a0507970..e2b5cb2eb34e 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -1277,7 +1277,6 @@ EXPORT_SYMBOL(tcf_block_cb_unregister); int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, struct tcf_result *res, bool compat_mode) { - __be16 protocol = tc_skb_protocol(skb); #ifdef CONFIG_NET_CLS_ACT const int max_reclassify_loop = 4; const struct tcf_proto *orig_tp = tp; @@ -1287,6 +1286,7 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, reclassify: #endif for (; tp; tp = rcu_dereference_bh(tp->next)) { + __be16 protocol = tc_skb_protocol(skb); int err; if (tp->protocol != protocol && @@ -1319,7 +1319,6 @@ reset: } tp = first_tp; - protocol = tc_skb_protocol(skb); goto reclassify; #endif } |