Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 942b8165 authored by David S. Miller's avatar David S. Miller
Browse files

pkt_sched: cls_api: Move away from NLMSG_NEW(). 



And use nlmsg_data() while we're here too, as well as remove
a useless cast.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f7a3283

net/sched/cls_api.c

+7 −5
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg) 
	int tp_created = 0;



replay:

	t = NLMSG_DATA(n);

	t = nlmsg_data(n);

	protocol = TC_H_MIN(t->tcm_info);

	prio = TC_H_MAJ(t->tcm_info);

	nprio = prio;
@@ -349,8 +349,10 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, 
	struct nlmsghdr  *nlh;

	unsigned char *b = skb_tail_pointer(skb);



	nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*tcm), flags);

	tcm = NLMSG_DATA(nlh);

	nlh = nlmsg_put(skb, pid, seq, event, sizeof(*tcm), flags);

	if (!nlh)

		goto out_nlmsg_trim;

	tcm = nlmsg_data(nlh);

	tcm->tcm_family = AF_UNSPEC;

	tcm->tcm__pad1 = 0;

	tcm->tcm__pad2 = 0;
@@ -368,7 +370,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, 
	nlh->nlmsg_len = skb_tail_pointer(skb) - b;

	return skb->len;



nlmsg_failure:

out_nlmsg_trim:

nla_put_failure:

	nlmsg_trim(skb, b);

	return -1;
@@ -418,7 +420,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) 
	struct net_device *dev;

	struct Qdisc *q;

	struct tcf_proto *tp, **chain;

	struct tcmsg *tcm = (struct tcmsg *)NLMSG_DATA(cb->nlh);

	struct tcmsg *tcm = nlmsg_data(cb->nlh);

	unsigned long cl = 0;

	const struct Qdisc_class_ops *cops;

	struct tcf_dump_args arg;