Merge branch 'for-linus-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / net / sched / act_api.c

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 3d43e4979f27c8dca3083c863549592216f741fe..af427a3dbcba238103169ab2a58005feda5fa2f1 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -392,11 +392,6 @@ int tcf_action_exec(struct sk_buff *skb, const struct list_head *actions,
        list_for_each_entry(a, actions, list) {
 repeat:
                ret = a->ops->act(skb, a, res);
-               if (TC_MUNGED & skb->tc_verd) {
-                       /* copied already, allow trampling */
-                       skb->tc_verd = SET_TC_OK2MUNGE(skb->tc_verd);
-                       skb->tc_verd = CLR_TC_MUNGED(skb->tc_verd);
-               }
                if (ret == TC_ACT_REPEAT)
                        goto repeat;    /* we need a ttl - JHS */
                if (ret != TC_ACT_PIPE)