summaryrefslogtreecommitdiffstats
path: root/net/sched/act_pedit.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2015-04-30 12:12:00 +0200
committerDavid S. Miller <davem@davemloft.net>2015-05-02 22:25:17 -0400
commit4749c3ef854e3a5d3dd3cc0ccd2dcb7e05d583bd (patch)
treebc74284df9d0379304268075705df659d35a8137 /net/sched/act_pedit.c
parent7eee8cd4d8d6ce3f70e6bea716c19b28635a5232 (diff)
downloadlinux-4749c3ef854e3a5d3dd3cc0ccd2dcb7e05d583bd.tar.gz
linux-4749c3ef854e3a5d3dd3cc0ccd2dcb7e05d583bd.tar.bz2
linux-4749c3ef854e3a5d3dd3cc0ccd2dcb7e05d583bd.zip
net: sched: remove TC_MUNGED bits
Not used. pedit sets TC_MUNGED when packet content was altered, but all the core does is unset MUNGED again and then set OK2MUNGE. And the latter isn't tested anywhere. So lets remove both TC_MUNGED and TC_OK2MUNGE. Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Alexei Starovoitov <ast@plumgrid.com> Acked-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_pedit.c')
-rw-r--r--net/sched/act_pedit.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 59649d588d79..17e6d6669c7f 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -108,7 +108,7 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
struct tcf_result *res)
{
struct tcf_pedit *p = a->priv;
- int i, munged = 0;
+ int i;
unsigned int off;
if (skb_unclone(skb, GFP_ATOMIC))
@@ -156,11 +156,8 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
*ptr = ((*ptr & tkey->mask) ^ tkey->val);
if (ptr == &_data)
skb_store_bits(skb, off + offset, ptr, 4);
- munged++;
}
- if (munged)
- skb->tc_verd = SET_TC_MUNGED(skb->tc_verd);
goto done;
} else
WARN(1, "pedit BUG: index %d\n", p->tcf_index);