aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/act_pedit.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2015-04-30 06:12:00 -0400
committerDavid S. Miller <davem@davemloft.net>2015-05-02 22:25:17 -0400
commit4749c3ef854e3a5d3dd3cc0ccd2dcb7e05d583bd (patch)
treebc74284df9d0379304268075705df659d35a8137 /net/sched/act_pedit.c
parent7eee8cd4d8d6ce3f70e6bea716c19b28635a5232 (diff)
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,
108 struct tcf_result *res) 108 struct tcf_result *res)
109{ 109{
110 struct tcf_pedit *p = a->priv; 110 struct tcf_pedit *p = a->priv;
111 int i, munged = 0; 111 int i;
112 unsigned int off; 112 unsigned int off;
113 113
114 if (skb_unclone(skb, GFP_ATOMIC)) 114 if (skb_unclone(skb, GFP_ATOMIC))
@@ -156,11 +156,8 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
156 *ptr = ((*ptr & tkey->mask) ^ tkey->val); 156 *ptr = ((*ptr & tkey->mask) ^ tkey->val);
157 if (ptr == &_data) 157 if (ptr == &_data)
158 skb_store_bits(skb, off + offset, ptr, 4); 158 skb_store_bits(skb, off + offset, ptr, 4);
159 munged++;
160 } 159 }
161 160
162 if (munged)
163 skb->tc_verd = SET_TC_MUNGED(skb->tc_verd);
164 goto done; 161 goto done;
165 } else 162 } else
166 WARN(1, "pedit BUG: index %d\n", p->tcf_index); 163 WARN(1, "pedit BUG: index %d\n", p->tcf_index);