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

Commit 02ef22ca authored by David S. Miller's avatar David S. Miller
Browse files

pkt_sched: sch_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 942b8165

net/sched/sch_api.c

+14 −10
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ check_loop_fn(struct Qdisc *q, unsigned long cl, struct qdisc_walker *w) 
static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)

{

	struct net *net = sock_net(skb->sk);

	struct tcmsg *tcm = NLMSG_DATA(n);

	struct tcmsg *tcm = nlmsg_data(n);

	struct nlattr *tca[TCA_MAX + 1];

	struct net_device *dev;

	u32 clid = tcm->tcm_parent;
@@ -1046,7 +1046,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg) 


replay:

	/* Reinit, just in case something touches this. */

	tcm = NLMSG_DATA(n);

	tcm = nlmsg_data(n);

	clid = tcm->tcm_parent;

	q = p = NULL;
@@ -1193,8 +1193,10 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, 
	struct gnet_dump d;

	struct qdisc_size_table *stab;



	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;
@@ -1230,7 +1232,7 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, 
	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;
@@ -1366,7 +1368,7 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb) 
static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)

{

	struct net *net = sock_net(skb->sk);

	struct tcmsg *tcm = NLMSG_DATA(n);

	struct tcmsg *tcm = nlmsg_data(n);

	struct nlattr *tca[TCA_MAX + 1];

	struct net_device *dev;

	struct Qdisc *q = NULL;
@@ -1498,8 +1500,10 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q, 
	struct gnet_dump d;

	const struct Qdisc_class_ops *cl_ops = q->ops->cl_ops;



	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;
@@ -1525,7 +1529,7 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q, 
	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;
@@ -1616,7 +1620,7 @@ static int tc_dump_tclass_root(struct Qdisc *root, struct sk_buff *skb, 


static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb)

{

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

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

	struct net *net = sock_net(skb->sk);

	struct netdev_queue *dev_queue;

	struct net_device *dev;