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

Commit b97bac64 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

rtnetlink: make rtnl_register accept a flags parameter 



This change allows us to later indicate to rtnetlink core that certain
doit functions should be called without acquiring rtnl_mutex.

This change should have no effect, we simply replace the last (now
unused) calcit argument with the new flag.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Reviewed-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1fa6d21

include/net/rtnetlink.h

+2 −3
Original line number Diff line number Diff line
@@ -7,12 +7,11 @@ 
typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *,

			      struct netlink_ext_ack *);

typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);

typedef u16 (*rtnl_calcit_func)(struct sk_buff *, struct nlmsghdr *);



int __rtnl_register(int protocol, int msgtype,

		    rtnl_doit_func, rtnl_dumpit_func, rtnl_calcit_func);

		    rtnl_doit_func, rtnl_dumpit_func, unsigned int flags);

void rtnl_register(int protocol, int msgtype,

		   rtnl_doit_func, rtnl_dumpit_func, rtnl_calcit_func);

		   rtnl_doit_func, rtnl_dumpit_func, unsigned int flags);

int rtnl_unregister(int protocol, int msgtype);

void rtnl_unregister_all(int protocol);

net/bridge/br_mdb.c

+3 −3
Original line number Diff line number Diff line
@@ -713,9 +713,9 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, 


void br_mdb_init(void)

{

	rtnl_register(PF_BRIDGE, RTM_GETMDB, NULL, br_mdb_dump, NULL);

	rtnl_register(PF_BRIDGE, RTM_NEWMDB, br_mdb_add, NULL, NULL);

	rtnl_register(PF_BRIDGE, RTM_DELMDB, br_mdb_del, NULL, NULL);

	rtnl_register(PF_BRIDGE, RTM_GETMDB, NULL, br_mdb_dump, 0);

	rtnl_register(PF_BRIDGE, RTM_NEWMDB, br_mdb_add, NULL, 0);

	rtnl_register(PF_BRIDGE, RTM_DELMDB, br_mdb_del, NULL, 0);

}



void br_mdb_uninit(void)

net/can/gw.c

+3 −3
Original line number Diff line number Diff line
@@ -1031,15 +1031,15 @@ static __init int cgw_module_init(void) 
	notifier.notifier_call = cgw_notifier;

	register_netdevice_notifier(&notifier);



	if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {

	if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, 0)) {

		unregister_netdevice_notifier(&notifier);

		kmem_cache_destroy(cgw_cache);

		return -ENOBUFS;

	}



	/* Only the first call to __rtnl_register can fail */

	__rtnl_register(PF_CAN, RTM_NEWROUTE, cgw_create_job, NULL, NULL);

	__rtnl_register(PF_CAN, RTM_DELROUTE, cgw_remove_job, NULL, NULL);

	__rtnl_register(PF_CAN, RTM_NEWROUTE, cgw_create_job, NULL, 0);

	__rtnl_register(PF_CAN, RTM_DELROUTE, cgw_remove_job, NULL, 0);



	return 0;

}

net/core/fib_rules.c

+3 −3
Original line number Diff line number Diff line
@@ -1026,9 +1026,9 @@ static struct pernet_operations fib_rules_net_ops = { 
static int __init fib_rules_init(void)

{

	int err;

	rtnl_register(PF_UNSPEC, RTM_NEWRULE, fib_nl_newrule, NULL, NULL);

	rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL, NULL);

	rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule, NULL);

	rtnl_register(PF_UNSPEC, RTM_NEWRULE, fib_nl_newrule, NULL, 0);

	rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL, 0);

	rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule, 0);



	err = register_pernet_subsys(&fib_rules_net_ops);

	if (err < 0)

net/core/neighbour.c

+5 −5
Original line number Diff line number Diff line
@@ -3261,13 +3261,13 @@ EXPORT_SYMBOL(neigh_sysctl_unregister); 


static int __init neigh_init(void)

{

	rtnl_register(PF_UNSPEC, RTM_NEWNEIGH, neigh_add, NULL, NULL);

	rtnl_register(PF_UNSPEC, RTM_DELNEIGH, neigh_delete, NULL, NULL);

	rtnl_register(PF_UNSPEC, RTM_GETNEIGH, NULL, neigh_dump_info, NULL);

	rtnl_register(PF_UNSPEC, RTM_NEWNEIGH, neigh_add, NULL, 0);

	rtnl_register(PF_UNSPEC, RTM_DELNEIGH, neigh_delete, NULL, 0);

	rtnl_register(PF_UNSPEC, RTM_GETNEIGH, NULL, neigh_dump_info, 0);



	rtnl_register(PF_UNSPEC, RTM_GETNEIGHTBL, NULL, neightbl_dump_info,

		      NULL);

	rtnl_register(PF_UNSPEC, RTM_SETNEIGHTBL, neightbl_set, NULL, NULL);

		      0);

	rtnl_register(PF_UNSPEC, RTM_SETNEIGHTBL, neightbl_set, NULL, 0);



	return 0;

}