Commit 24beeab5 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NET_SCHED]: Use typeful attribute construction helpers 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 57e1c487

net/sched/act_api.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int tcf_del_walker(struct sk_buff *skb, struct tc_action *a, 
			p = s_p;

		}

	}

	NLA_PUT(skb, TCA_FCNT, 4, &n_i);

	NLA_PUT_U32(skb, TCA_FCNT, n_i);

	nla_nest_end(skb, nest);



	return n_i;

net/sched/act_ipt.c

+2 −2
Original line number Diff line number Diff line
@@ -254,8 +254,8 @@ static int tcf_ipt_dump(struct sk_buff *skb, struct tc_action *a, int bind, int 
	strcpy(t->u.user.name, ipt->tcfi_t->u.kernel.target->name);



	NLA_PUT(skb, TCA_IPT_TARG, ipt->tcfi_t->u.user.target_size, t);

	NLA_PUT(skb, TCA_IPT_INDEX, 4, &ipt->tcf_index);

	NLA_PUT(skb, TCA_IPT_HOOK, 4, &ipt->tcfi_hook);

	NLA_PUT_U32(skb, TCA_IPT_INDEX, ipt->tcf_index);

	NLA_PUT_U32(skb, TCA_IPT_HOOK, ipt->tcfi_hook);

	NLA_PUT(skb, TCA_IPT_CNT, sizeof(struct tc_cnt), &c);

	NLA_PUT_STRING(skb, TCA_IPT_TABLE, ipt->tcfi_tname);

	tm.install = jiffies_to_clock_t(jiffies - ipt->tcf_tm.install);

net/sched/act_police.c

+2 −3
Original line number Diff line number Diff line
@@ -339,10 +339,9 @@ tcf_act_police_dump(struct sk_buff *skb, struct tc_action *a, int bind, int ref) 
		memset(&opt.peakrate, 0, sizeof(opt.peakrate));

	NLA_PUT(skb, TCA_POLICE_TBF, sizeof(opt), &opt);

	if (police->tcfp_result)

		NLA_PUT(skb, TCA_POLICE_RESULT, sizeof(int),

			&police->tcfp_result);

		NLA_PUT_U32(skb, TCA_POLICE_RESULT, police->tcfp_result);

	if (police->tcfp_ewma_rate)

		NLA_PUT(skb, TCA_POLICE_AVRATE, 4, &police->tcfp_ewma_rate);

		NLA_PUT_U32(skb, TCA_POLICE_AVRATE, police->tcfp_ewma_rate);

	return skb->len;



nla_put_failure:

net/sched/cls_basic.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int basic_dump(struct tcf_proto *tp, unsigned long fh, 
		goto nla_put_failure;



	if (f->res.classid)

		NLA_PUT(skb, TCA_BASIC_CLASSID, sizeof(u32), &f->res.classid);

		NLA_PUT_U32(skb, TCA_BASIC_CLASSID, f->res.classid);



	if (tcf_exts_dump(skb, &f->exts, &basic_ext_map) < 0 ||

	    tcf_em_tree_dump(skb, &f->ematches, TCA_BASIC_EMATCHES) < 0)

net/sched/cls_fw.c

+2 −2
Original line number Diff line number Diff line
@@ -349,13 +349,13 @@ static int fw_dump(struct tcf_proto *tp, unsigned long fh, 
		goto nla_put_failure;



	if (f->res.classid)

		NLA_PUT(skb, TCA_FW_CLASSID, 4, &f->res.classid);

		NLA_PUT_U32(skb, TCA_FW_CLASSID, f->res.classid);

#ifdef CONFIG_NET_CLS_IND

	if (strlen(f->indev))

		NLA_PUT_STRING(skb, TCA_FW_INDEV, f->indev);

#endif /* CONFIG_NET_CLS_IND */

	if (head->mask != 0xFFFFFFFF)

		NLA_PUT(skb, TCA_FW_MASK, 4, &head->mask);

		NLA_PUT_U32(skb, TCA_FW_MASK, head->mask);



	if (tcf_exts_dump(skb, &f->exts, &fw_ext_map) < 0)

		goto nla_put_failure;