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

Commit 737100e1 authored by David S. Miller's avatar David S. Miller
Browse files

decnet: dn_route: Move away from NLMSG_NEW(). 



And use nlmsg_data() while we're here too.

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

net/decnet/dn_route.c

+7 −5
Original line number Diff line number Diff line
@@ -1518,8 +1518,10 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq, 
	unsigned char *b = skb_tail_pointer(skb);

	long expires;



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

	r = NLMSG_DATA(nlh);

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

	if (!nlh)

		goto out_nlmsg_trim;

	r = nlmsg_data(nlh);

	r->rtm_family = AF_DECnet;

	r->rtm_dst_len = 16;

	r->rtm_src_len = 0;
@@ -1559,7 +1561,7 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq, 
	nlh->nlmsg_len = skb_tail_pointer(skb) - b;

	return skb->len;



nlmsg_failure:

out_nlmsg_trim:

rtattr_failure:

	nlmsg_trim(skb, b);

	return -1;
@@ -1572,7 +1574,7 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void 
{

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

	struct rtattr **rta = arg;

	struct rtmsg *rtm = NLMSG_DATA(nlh);

	struct rtmsg *rtm = nlmsg_data(nlh);

	struct dn_route *rt = NULL;

	struct dn_skb_cb *cb;

	int err;
@@ -1669,7 +1671,7 @@ int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb) 


	if (NLMSG_PAYLOAD(cb->nlh, 0) < sizeof(struct rtmsg))

		return -EINVAL;

	if (!(((struct rtmsg *)NLMSG_DATA(cb->nlh))->rtm_flags&RTM_F_CLONED))

	if (!(((struct rtmsg *)nlmsg_data(cb->nlh))->rtm_flags&RTM_F_CLONED))

		return 0;



	s_h = cb->args[0];