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

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

net/sched/act_pedit.c

+67 −70
Original line number Diff line number Diff line
@@ -346,8 +346,12 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb, 
				    const struct tc_action *a,

				    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_key_ex *tkey_ex;

	struct tcf_pedit_parms *parms;

	struct tc_pedit_key *tkey;

	u32 max_offset;

	int i;
@@ -363,16 +367,12 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb, 
	tcf_lastuse_update(&p->tcf_tm);

	tcf_action_update_bstats(&p->common, skb);



	if (parms->tcfp_nkeys > 0) {

		struct tc_pedit_key *tkey = parms->tcfp_keys;

		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;

	tkey = parms->tcfp_keys;

	tkey_ex = parms->tcfp_keys_ex;



	for (i = parms->tcfp_nkeys; i > 0; i--, tkey++) {

			u32 *ptr, hdata;

		int offset = tkey->off;

		u32 *ptr, hdata;

		int hoffset;

		u32 val;

		int rc;
@@ -441,9 +441,6 @@ TC_INDIRECT_SCOPE int tcf_pedit_act(struct sk_buff *skb, 
	}



	goto done;

	} else {

		WARN(1, "pedit BUG: index %d\n", p->tcf_index);

	}



bad:

	spin_lock(&p->tcf_lock);