Commit 95b06938 authored by Pedro Tammela's avatar Pedro Tammela Committed by Paolo Abeni

net/sched: simplify tcf_pedit_act

Remove the check for a negative number of keys as
this cannot ever happen
Reviewed-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarPedro Tammela <pctammela@mojatatu.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 52cf89f7
...@@ -346,8 +346,12 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb, ...@@ -346,8 +346,12 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb,
const struct tc_action *a, const struct tc_action *a,
struct tcf_result *res) struct tcf_result *res)
{ {
enum pedit_header_type htype = TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK;
enum pedit_cmd cmd = TCA_PEDIT_KEY_EX_CMD_SET;
struct tcf_pedit *p = to_pedit(a); struct tcf_pedit *p = to_pedit(a);
struct tcf_pedit_key_ex *tkey_ex;
struct tcf_pedit_parms *parms; struct tcf_pedit_parms *parms;
struct tc_pedit_key *tkey;
u32 max_offset; u32 max_offset;
int i; int i;
...@@ -363,16 +367,12 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb, ...@@ -363,16 +367,12 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb,
tcf_lastuse_update(&p->tcf_tm); tcf_lastuse_update(&p->tcf_tm);
tcf_action_update_bstats(&p->common, skb); tcf_action_update_bstats(&p->common, skb);
if (parms->tcfp_nkeys > 0) { tkey = parms->tcfp_keys;
struct tc_pedit_key *tkey = parms->tcfp_keys; tkey_ex = parms->tcfp_keys_ex;
struct tcf_pedit_key_ex *tkey_ex = parms->tcfp_keys_ex;
enum pedit_header_type htype =
TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK;
enum pedit_cmd cmd = TCA_PEDIT_KEY_EX_CMD_SET;
for (i = parms->tcfp_nkeys; i > 0; i--, tkey++) { for (i = parms->tcfp_nkeys; i > 0; i--, tkey++) {
u32 *ptr, hdata;
int offset = tkey->off; int offset = tkey->off;
u32 *ptr, hdata;
int hoffset; int hoffset;
u32 val; u32 val;
int rc; int rc;
...@@ -441,9 +441,6 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb, ...@@ -441,9 +441,6 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb,
} }
goto done; goto done;
} else {
WARN(1, "pedit BUG: index %d\n", p->tcf_index);
}
bad: bad:
spin_lock(&p->tcf_lock); spin_lock(&p->tcf_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment