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

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

[IPv4] route: Convert route notifications to use rtnl_notify() 



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

net/ipv4/fib_semantics.c

+16 −16
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/if_arp.h>

#include <linux/proc_fs.h>

#include <linux/skbuff.h>

#include <linux/netlink.h>

#include <linux/init.h>



#include <net/arp.h>
@@ -44,6 +43,7 @@ 
#include <net/sock.h>

#include <net/ip_fib.h>

#include <net/ip_mp_alg.h>

#include <net/netlink.h>



#include "fib_lookup.h"
@@ -278,25 +278,25 @@ void rtmsg_fib(int event, u32 key, struct fib_alias *fa, 
{

	struct sk_buff *skb;

	u32 pid = req ? req->pid : n->nlmsg_pid;

	int size = NLMSG_SPACE(sizeof(struct rtmsg)+256);

	int payload = sizeof(struct rtmsg) + 256;

	int err = -ENOBUFS;



	skb = alloc_skb(size, GFP_KERNEL);

	if (!skb)

		return;

	skb = nlmsg_new(nlmsg_total_size(payload), GFP_KERNEL);

	if (skb == NULL)

		goto errout;



	if (fib_dump_info(skb, pid, n->nlmsg_seq, event, tb_id,

			  fa->fa_type, fa->fa_scope, &key, z,

			  fa->fa_tos,

			  fa->fa_info, 0) < 0) {

	err = fib_dump_info(skb, pid, n->nlmsg_seq, event, tb_id,

			    fa->fa_type, fa->fa_scope, &key, z, fa->fa_tos,

			    fa->fa_info, 0);

	if (err < 0) {

		kfree_skb(skb);

		return;

		goto errout;

	}

	NETLINK_CB(skb).dst_group = RTNLGRP_IPV4_ROUTE;

	if (n->nlmsg_flags&NLM_F_ECHO)

		atomic_inc(&skb->users);

	netlink_broadcast(rtnl, skb, pid, RTNLGRP_IPV4_ROUTE, GFP_KERNEL);

	if (n->nlmsg_flags&NLM_F_ECHO)

		netlink_unicast(rtnl, skb, pid, MSG_DONTWAIT);



	err = rtnl_notify(skb, pid, RTNLGRP_IPV4_ROUTE, n, GFP_KERNEL);

errout:

	if (err < 0)

		rtnl_set_sk_err(RTNLGRP_IPV4_ROUTE, err);

}



/* Return the first fib alias matching TOS with