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

Commit 2942e900 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[RTNETLINK]: Use rtnl_unicast() for rtnetlink unicasts 



Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8d8fda5

include/linux/rtnetlink.h

+1 −0
Original line number Diff line number Diff line
@@ -584,6 +584,7 @@ struct rtnetlink_link 


extern struct rtnetlink_link * rtnetlink_links[NPROTO];

extern int rtnetlink_send(struct sk_buff *skb, u32 pid, u32 group, int echo);

extern int rtnl_unicast(struct sk_buff *skb, u32 pid);

extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics);



extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const void *data);

net/core/rtnetlink.c

+7 −3
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ int rtnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo) 
	return err;

}



int rtnl_unicast(struct sk_buff *skb, u32 pid)

{

	return nlmsg_unicast(rtnl, skb, pid);

}



int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics)

{

	struct rtattr *mx = (struct rtattr*)skb->tail;
@@ -574,9 +579,7 @@ static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 
		goto errout;

	}



	err = netlink_unicast(rtnl, skb, NETLINK_CB(skb).pid, MSG_DONTWAIT);

	if (err > 0)

		err = 0;

	err = rtnl_unicast(skb, NETLINK_CB(skb).pid);

errout:

	kfree(iw_buf);

	dev_put(dev);
@@ -825,3 +828,4 @@ EXPORT_SYMBOL(rtnl); 
EXPORT_SYMBOL(rtnl_lock);

EXPORT_SYMBOL(rtnl_trylock);

EXPORT_SYMBOL(rtnl_unlock);

EXPORT_SYMBOL(rtnl_unicast);

net/decnet/dn_route.c

+1 −3
Original line number Diff line number Diff line
@@ -1611,9 +1611,7 @@ int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void *arg) 
		goto out_free;

	}



	err = netlink_unicast(rtnl, skb, NETLINK_CB(in_skb).pid, MSG_DONTWAIT);



	return err;

	return rtnl_unicast(skb, NETLINK_CB(in_skb).pid);



out_free:

	kfree_skb(skb);

net/ipv4/ipmr.c

+4 −3
Original line number Diff line number Diff line
@@ -312,7 +312,8 @@ static void ipmr_destroy_unres(struct mfc_cache *c) 
			e = NLMSG_DATA(nlh);

			e->error = -ETIMEDOUT;

			memset(&e->msg, 0, sizeof(e->msg));

			netlink_unicast(rtnl, skb, NETLINK_CB(skb).dst_pid, MSG_DONTWAIT);



			rtnl_unicast(skb, NETLINK_CB(skb).pid);

		} else

			kfree_skb(skb);

	}
@@ -512,7 +513,6 @@ static void ipmr_cache_resolve(struct mfc_cache *uc, struct mfc_cache *c) 


	while((skb=__skb_dequeue(&uc->mfc_un.unres.unresolved))) {

		if (skb->nh.iph->version == 0) {

			int err;

			struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull(skb, sizeof(struct iphdr));



			if (ipmr_fill_mroute(skb, c, NLMSG_DATA(nlh)) > 0) {
@@ -525,7 +525,8 @@ static void ipmr_cache_resolve(struct mfc_cache *uc, struct mfc_cache *c) 
				e->error = -EMSGSIZE;

				memset(&e->msg, 0, sizeof(e->msg));

			}

			err = netlink_unicast(rtnl, skb, NETLINK_CB(skb).dst_pid, MSG_DONTWAIT);



			rtnl_unicast(skb, NETLINK_CB(skb).pid);

		} else

			ip_mr_forward(skb, c, 0);

	}

net/ipv4/route.c

+3 −4
Original line number Diff line number Diff line
@@ -2809,10 +2809,9 @@ int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void *arg) 
		goto out_free;

	}



	err = netlink_unicast(rtnl, skb, NETLINK_CB(in_skb).pid, MSG_DONTWAIT);

	if (err > 0)

		err = 0;

out:	return err;

	err = rtnl_unicast(skb, NETLINK_CB(in_skb).pid);

out:

	return err;



out_free:

	kfree_skb(skb);