Skip to content

Commit b97bac6

Browse files
Florian Westphaldavem330
Florian Westphal
authored and
davem330
committed
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: Florian Westphal <[email protected]> Reviewed-by: Hannes Frederic Sowa <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e1fa6d2 commit b97bac6

26 files changed

+95
-96
lines changed

‎include/net/rtnetlink.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *,
88
struct netlink_ext_ack *);
99
typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);
10-
typedef u16 (*rtnl_calcit_func)(struct sk_buff *, struct nlmsghdr *);
1110

1211
int __rtnl_register(int protocol, int msgtype,
13-
rtnl_doit_func, rtnl_dumpit_func, rtnl_calcit_func);
12+
rtnl_doit_func, rtnl_dumpit_func, unsigned int flags);
1413
void rtnl_register(int protocol, int msgtype,
15-
rtnl_doit_func, rtnl_dumpit_func, rtnl_calcit_func);
14+
rtnl_doit_func, rtnl_dumpit_func, unsigned int flags);
1615
int rtnl_unregister(int protocol, int msgtype);
1716
void rtnl_unregister_all(int protocol);
1817

‎net/bridge/br_mdb.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -713,9 +713,9 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
713713

714714
void br_mdb_init(void)
715715
{
716-
rtnl_register(PF_BRIDGE, RTM_GETMDB, NULL, br_mdb_dump, NULL);
717-
rtnl_register(PF_BRIDGE, RTM_NEWMDB, br_mdb_add, NULL, NULL);
718-
rtnl_register(PF_BRIDGE, RTM_DELMDB, br_mdb_del, NULL, NULL);
716+
rtnl_register(PF_BRIDGE, RTM_GETMDB, NULL, br_mdb_dump, 0);
717+
rtnl_register(PF_BRIDGE, RTM_NEWMDB, br_mdb_add, NULL, 0);
718+
rtnl_register(PF_BRIDGE, RTM_DELMDB, br_mdb_del, NULL, 0);
719719
}
720720

721721
void br_mdb_uninit(void)

‎net/can/gw.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,15 +1031,15 @@ static __init int cgw_module_init(void)
10311031
notifier.notifier_call = cgw_notifier;
10321032
register_netdevice_notifier(&notifier);
10331033

1034-
if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
1034+
if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, 0)) {
10351035
unregister_netdevice_notifier(&notifier);
10361036
kmem_cache_destroy(cgw_cache);
10371037
return -ENOBUFS;
10381038
}
10391039

10401040
/* Only the first call to __rtnl_register can fail */
1041-
__rtnl_register(PF_CAN, RTM_NEWROUTE, cgw_create_job, NULL, NULL);
1042-
__rtnl_register(PF_CAN, RTM_DELROUTE, cgw_remove_job, NULL, NULL);
1041+
__rtnl_register(PF_CAN, RTM_NEWROUTE, cgw_create_job, NULL, 0);
1042+
__rtnl_register(PF_CAN, RTM_DELROUTE, cgw_remove_job, NULL, 0);
10431043

10441044
return 0;
10451045
}

‎net/core/fib_rules.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,9 +1026,9 @@ static struct pernet_operations fib_rules_net_ops = {
10261026
static int __init fib_rules_init(void)
10271027
{
10281028
int err;
1029-
rtnl_register(PF_UNSPEC, RTM_NEWRULE, fib_nl_newrule, NULL, NULL);
1030-
rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL, NULL);
1031-
rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule, NULL);
1029+
rtnl_register(PF_UNSPEC, RTM_NEWRULE, fib_nl_newrule, NULL, 0);
1030+
rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL, 0);
1031+
rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule, 0);
10321032

10331033
err = register_pernet_subsys(&fib_rules_net_ops);
10341034
if (err < 0)

‎net/core/neighbour.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3261,13 +3261,13 @@ EXPORT_SYMBOL(neigh_sysctl_unregister);
32613261

32623262
static int __init neigh_init(void)
32633263
{
3264-
rtnl_register(PF_UNSPEC, RTM_NEWNEIGH, neigh_add, NULL, NULL);
3265-
rtnl_register(PF_UNSPEC, RTM_DELNEIGH, neigh_delete, NULL, NULL);
3266-
rtnl_register(PF_UNSPEC, RTM_GETNEIGH, NULL, neigh_dump_info, NULL);
3264+
rtnl_register(PF_UNSPEC, RTM_NEWNEIGH, neigh_add, NULL, 0);
3265+
rtnl_register(PF_UNSPEC, RTM_DELNEIGH, neigh_delete, NULL, 0);
3266+
rtnl_register(PF_UNSPEC, RTM_GETNEIGH, NULL, neigh_dump_info, 0);
32673267

32683268
rtnl_register(PF_UNSPEC, RTM_GETNEIGHTBL, NULL, neightbl_dump_info,
3269-
NULL);
3270-
rtnl_register(PF_UNSPEC, RTM_SETNEIGHTBL, neightbl_set, NULL, NULL);
3269+
0);
3270+
rtnl_register(PF_UNSPEC, RTM_SETNEIGHTBL, neightbl_set, NULL, 0);
32713271

32723272
return 0;
32733273
}

‎net/core/net_namespace.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,9 +855,9 @@ static int __init net_ns_init(void)
855855

856856
register_pernet_subsys(&net_ns_ops);
857857

858-
rtnl_register(PF_UNSPEC, RTM_NEWNSID, rtnl_net_newid, NULL, NULL);
858+
rtnl_register(PF_UNSPEC, RTM_NEWNSID, rtnl_net_newid, NULL, 0);
859859
rtnl_register(PF_UNSPEC, RTM_GETNSID, rtnl_net_getid, rtnl_net_dumpid,
860-
NULL);
860+
0);
861861

862862
return 0;
863863
}

‎net/core/rtnetlink.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static rtnl_dumpit_func rtnl_get_dumpit(int protocol, int msgindex)
178178
* @msgtype: rtnetlink message type
179179
* @doit: Function pointer called for each request message
180180
* @dumpit: Function pointer called for each dump request (NLM_F_DUMP) message
181-
* @calcit: Function pointer to calc size of dump message
181+
* @flags: rtnl_link_flags to modifiy behaviour of doit/dumpit functions
182182
*
183183
* Registers the specified function pointers (at least one of them has
184184
* to be non-NULL) to be called whenever a request message for the
@@ -192,7 +192,7 @@ static rtnl_dumpit_func rtnl_get_dumpit(int protocol, int msgindex)
192192
*/
193193
int __rtnl_register(int protocol, int msgtype,
194194
rtnl_doit_func doit, rtnl_dumpit_func dumpit,
195-
rtnl_calcit_func calcit)
195+
unsigned int flags)
196196
{
197197
struct rtnl_link *tab;
198198
int msgindex;
@@ -230,9 +230,9 @@ EXPORT_SYMBOL_GPL(__rtnl_register);
230230
*/
231231
void rtnl_register(int protocol, int msgtype,
232232
rtnl_doit_func doit, rtnl_dumpit_func dumpit,
233-
rtnl_calcit_func calcit)
233+
unsigned int flags)
234234
{
235-
if (__rtnl_register(protocol, msgtype, doit, dumpit, calcit) < 0)
235+
if (__rtnl_register(protocol, msgtype, doit, dumpit, flags) < 0)
236236
panic("Unable to register rtnetlink message handler, "
237237
"protocol = %d, message type = %d\n",
238238
protocol, msgtype);
@@ -4279,23 +4279,23 @@ void __init rtnetlink_init(void)
42794279
register_netdevice_notifier(&rtnetlink_dev_notifier);
42804280

42814281
rtnl_register(PF_UNSPEC, RTM_GETLINK, rtnl_getlink,
4282-
rtnl_dump_ifinfo, NULL);
4283-
rtnl_register(PF_UNSPEC, RTM_SETLINK, rtnl_setlink, NULL, NULL);
4284-
rtnl_register(PF_UNSPEC, RTM_NEWLINK, rtnl_newlink, NULL, NULL);
4285-
rtnl_register(PF_UNSPEC, RTM_DELLINK, rtnl_dellink, NULL, NULL);
4282+
rtnl_dump_ifinfo, 0);
4283+
rtnl_register(PF_UNSPEC, RTM_SETLINK, rtnl_setlink, NULL, 0);
4284+
rtnl_register(PF_UNSPEC, RTM_NEWLINK, rtnl_newlink, NULL, 0);
4285+
rtnl_register(PF_UNSPEC, RTM_DELLINK, rtnl_dellink, NULL, 0);
42864286

4287-
rtnl_register(PF_UNSPEC, RTM_GETADDR, NULL, rtnl_dump_all, NULL);
4288-
rtnl_register(PF_UNSPEC, RTM_GETROUTE, NULL, rtnl_dump_all, NULL);
4289-
rtnl_register(PF_UNSPEC, RTM_GETNETCONF, NULL, rtnl_dump_all, NULL);
4287+
rtnl_register(PF_UNSPEC, RTM_GETADDR, NULL, rtnl_dump_all, 0);
4288+
rtnl_register(PF_UNSPEC, RTM_GETROUTE, NULL, rtnl_dump_all, 0);
4289+
rtnl_register(PF_UNSPEC, RTM_GETNETCONF, NULL, rtnl_dump_all, 0);
42904290

4291-
rtnl_register(PF_BRIDGE, RTM_NEWNEIGH, rtnl_fdb_add, NULL, NULL);
4292-
rtnl_register(PF_BRIDGE, RTM_DELNEIGH, rtnl_fdb_del, NULL, NULL);
4293-
rtnl_register(PF_BRIDGE, RTM_GETNEIGH, NULL, rtnl_fdb_dump, NULL);
4291+
rtnl_register(PF_BRIDGE, RTM_NEWNEIGH, rtnl_fdb_add, NULL, 0);
4292+
rtnl_register(PF_BRIDGE, RTM_DELNEIGH, rtnl_fdb_del, NULL, 0);
4293+
rtnl_register(PF_BRIDGE, RTM_GETNEIGH, NULL, rtnl_fdb_dump, 0);
42944294

4295-
rtnl_register(PF_BRIDGE, RTM_GETLINK, NULL, rtnl_bridge_getlink, NULL);
4296-
rtnl_register(PF_BRIDGE, RTM_DELLINK, rtnl_bridge_dellink, NULL, NULL);
4297-
rtnl_register(PF_BRIDGE, RTM_SETLINK, rtnl_bridge_setlink, NULL, NULL);
4295+
rtnl_register(PF_BRIDGE, RTM_GETLINK, NULL, rtnl_bridge_getlink, 0);
4296+
rtnl_register(PF_BRIDGE, RTM_DELLINK, rtnl_bridge_dellink, NULL, 0);
4297+
rtnl_register(PF_BRIDGE, RTM_SETLINK, rtnl_bridge_setlink, NULL, 0);
42984298

42994299
rtnl_register(PF_UNSPEC, RTM_GETSTATS, rtnl_stats_get, rtnl_stats_dump,
4300-
NULL);
4300+
0);
43014301
}

‎net/dcb/dcbnl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,8 +1938,8 @@ static int __init dcbnl_init(void)
19381938
{
19391939
INIT_LIST_HEAD(&dcb_app_list);
19401940

1941-
rtnl_register(PF_UNSPEC, RTM_GETDCB, dcb_doit, NULL, NULL);
1942-
rtnl_register(PF_UNSPEC, RTM_SETDCB, dcb_doit, NULL, NULL);
1941+
rtnl_register(PF_UNSPEC, RTM_GETDCB, dcb_doit, NULL, 0);
1942+
rtnl_register(PF_UNSPEC, RTM_SETDCB, dcb_doit, NULL, 0);
19431943

19441944
return 0;
19451945
}

‎net/decnet/dn_dev.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,9 +1419,9 @@ void __init dn_dev_init(void)
14191419

14201420
dn_dev_devices_on();
14211421

1422-
rtnl_register(PF_DECnet, RTM_NEWADDR, dn_nl_newaddr, NULL, NULL);
1423-
rtnl_register(PF_DECnet, RTM_DELADDR, dn_nl_deladdr, NULL, NULL);
1424-
rtnl_register(PF_DECnet, RTM_GETADDR, NULL, dn_nl_dump_ifaddr, NULL);
1422+
rtnl_register(PF_DECnet, RTM_NEWADDR, dn_nl_newaddr, NULL, 0);
1423+
rtnl_register(PF_DECnet, RTM_DELADDR, dn_nl_deladdr, NULL, 0);
1424+
rtnl_register(PF_DECnet, RTM_GETADDR, NULL, dn_nl_dump_ifaddr, 0);
14251425

14261426
proc_create("decnet_dev", S_IRUGO, init_net.proc_net, &dn_dev_seq_fops);
14271427

‎net/decnet/dn_fib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,8 +791,8 @@ void __init dn_fib_init(void)
791791

792792
register_dnaddr_notifier(&dn_fib_dnaddr_notifier);
793793

794-
rtnl_register(PF_DECnet, RTM_NEWROUTE, dn_fib_rtm_newroute, NULL, NULL);
795-
rtnl_register(PF_DECnet, RTM_DELROUTE, dn_fib_rtm_delroute, NULL, NULL);
794+
rtnl_register(PF_DECnet, RTM_NEWROUTE, dn_fib_rtm_newroute, NULL, 0);
795+
rtnl_register(PF_DECnet, RTM_DELROUTE, dn_fib_rtm_delroute, NULL, 0);
796796
}
797797

798798

‎net/decnet/dn_route.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1922,10 +1922,10 @@ void __init dn_route_init(void)
19221922

19231923
#ifdef CONFIG_DECNET_ROUTER
19241924
rtnl_register(PF_DECnet, RTM_GETROUTE, dn_cache_getroute,
1925-
dn_fib_dump, NULL);
1925+
dn_fib_dump, 0);
19261926
#else
19271927
rtnl_register(PF_DECnet, RTM_GETROUTE, dn_cache_getroute,
1928-
dn_cache_dump, NULL);
1928+
dn_cache_dump, 0);
19291929
#endif
19301930
}
19311931

‎net/ipv4/devinet.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2491,9 +2491,9 @@ void __init devinet_init(void)
24912491

24922492
rtnl_af_register(&inet_af_ops);
24932493

2494-
rtnl_register(PF_INET, RTM_NEWADDR, inet_rtm_newaddr, NULL, NULL);
2495-
rtnl_register(PF_INET, RTM_DELADDR, inet_rtm_deladdr, NULL, NULL);
2496-
rtnl_register(PF_INET, RTM_GETADDR, NULL, inet_dump_ifaddr, NULL);
2494+
rtnl_register(PF_INET, RTM_NEWADDR, inet_rtm_newaddr, NULL, 0);
2495+
rtnl_register(PF_INET, RTM_DELADDR, inet_rtm_deladdr, NULL, 0);
2496+
rtnl_register(PF_INET, RTM_GETADDR, NULL, inet_dump_ifaddr, 0);
24972497
rtnl_register(PF_INET, RTM_GETNETCONF, inet_netconf_get_devconf,
2498-
inet_netconf_dump_devconf, NULL);
2498+
inet_netconf_dump_devconf, 0);
24992499
}

‎net/ipv4/fib_frontend.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,7 +1348,7 @@ void __init ip_fib_init(void)
13481348
register_netdevice_notifier(&fib_netdev_notifier);
13491349
register_inetaddr_notifier(&fib_inetaddr_notifier);
13501350

1351-
rtnl_register(PF_INET, RTM_NEWROUTE, inet_rtm_newroute, NULL, NULL);
1352-
rtnl_register(PF_INET, RTM_DELROUTE, inet_rtm_delroute, NULL, NULL);
1353-
rtnl_register(PF_INET, RTM_GETROUTE, NULL, inet_dump_fib, NULL);
1351+
rtnl_register(PF_INET, RTM_NEWROUTE, inet_rtm_newroute, NULL, 0);
1352+
rtnl_register(PF_INET, RTM_DELROUTE, inet_rtm_delroute, NULL, 0);
1353+
rtnl_register(PF_INET, RTM_GETROUTE, NULL, inet_dump_fib, 0);
13541354
}

‎net/ipv4/ipmr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3114,14 +3114,14 @@ int __init ip_mr_init(void)
31143114
}
31153115
#endif
31163116
rtnl_register(RTNL_FAMILY_IPMR, RTM_GETROUTE,
3117-
ipmr_rtm_getroute, ipmr_rtm_dumproute, NULL);
3117+
ipmr_rtm_getroute, ipmr_rtm_dumproute, 0);
31183118
rtnl_register(RTNL_FAMILY_IPMR, RTM_NEWROUTE,
3119-
ipmr_rtm_route, NULL, NULL);
3119+
ipmr_rtm_route, NULL, 0);
31203120
rtnl_register(RTNL_FAMILY_IPMR, RTM_DELROUTE,
3121-
ipmr_rtm_route, NULL, NULL);
3121+
ipmr_rtm_route, NULL, 0);
31223122

31233123
rtnl_register(RTNL_FAMILY_IPMR, RTM_GETLINK,
3124-
NULL, ipmr_rtm_dumplink, NULL);
3124+
NULL, ipmr_rtm_dumplink, 0);
31253125
return 0;
31263126

31273127
#ifdef CONFIG_IP_PIMSM_V2

‎net/ipv4/route.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3067,7 +3067,7 @@ int __init ip_rt_init(void)
30673067
xfrm_init();
30683068
xfrm4_init();
30693069
#endif
3070-
rtnl_register(PF_INET, RTM_GETROUTE, inet_rtm_getroute, NULL, NULL);
3070+
rtnl_register(PF_INET, RTM_GETROUTE, inet_rtm_getroute, NULL, 0);
30713071

30723072
#ifdef CONFIG_SYSCTL
30733073
register_pernet_subsys(&sysctl_route_ops);

‎net/ipv6/addrconf.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6605,21 +6605,21 @@ int __init addrconf_init(void)
66056605
rtnl_af_register(&inet6_ops);
66066606

66076607
err = __rtnl_register(PF_INET6, RTM_GETLINK, NULL, inet6_dump_ifinfo,
6608-
NULL);
6608+
0);
66096609
if (err < 0)
66106610
goto errout;
66116611

66126612
/* Only the first call to __rtnl_register can fail */
6613-
__rtnl_register(PF_INET6, RTM_NEWADDR, inet6_rtm_newaddr, NULL, NULL);
6614-
__rtnl_register(PF_INET6, RTM_DELADDR, inet6_rtm_deladdr, NULL, NULL);
6613+
__rtnl_register(PF_INET6, RTM_NEWADDR, inet6_rtm_newaddr, NULL, 0);
6614+
__rtnl_register(PF_INET6, RTM_DELADDR, inet6_rtm_deladdr, NULL, 0);
66156615
__rtnl_register(PF_INET6, RTM_GETADDR, inet6_rtm_getaddr,
6616-
inet6_dump_ifaddr, NULL);
6616+
inet6_dump_ifaddr, 0);
66176617
__rtnl_register(PF_INET6, RTM_GETMULTICAST, NULL,
6618-
inet6_dump_ifmcaddr, NULL);
6618+
inet6_dump_ifmcaddr, 0);
66196619
__rtnl_register(PF_INET6, RTM_GETANYCAST, NULL,
6620-
inet6_dump_ifacaddr, NULL);
6620+
inet6_dump_ifacaddr, 0);
66216621
__rtnl_register(PF_INET6, RTM_GETNETCONF, inet6_netconf_get_devconf,
6622-
inet6_netconf_dump_devconf, NULL);
6622+
inet6_netconf_dump_devconf, 0);
66236623

66246624
ipv6_addr_label_rtnl_register();
66256625

‎net/ipv6/addrlabel.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,10 +593,10 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,
593593
void __init ipv6_addr_label_rtnl_register(void)
594594
{
595595
__rtnl_register(PF_INET6, RTM_NEWADDRLABEL, ip6addrlbl_newdel,
596-
NULL, NULL);
596+
NULL, 0);
597597
__rtnl_register(PF_INET6, RTM_DELADDRLABEL, ip6addrlbl_newdel,
598-
NULL, NULL);
598+
NULL, 0);
599599
__rtnl_register(PF_INET6, RTM_GETADDRLABEL, ip6addrlbl_get,
600-
ip6addrlbl_dump, NULL);
600+
ip6addrlbl_dump, 0);
601601
}
602602

‎net/ipv6/ip6_fib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2038,7 +2038,7 @@ int __init fib6_init(void)
20382038
goto out_kmem_cache_create;
20392039

20402040
ret = __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, inet6_dump_fib,
2041-
NULL);
2041+
0);
20422042
if (ret)
20432043
goto out_unregister_subsys;
20442044

‎net/ipv6/ip6mr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,7 @@ int __init ip6_mr_init(void)
14271427
}
14281428
#endif
14291429
rtnl_register(RTNL_FAMILY_IP6MR, RTM_GETROUTE, NULL,
1430-
ip6mr_rtm_dumproute, NULL);
1430+
ip6mr_rtm_dumproute, 0);
14311431
return 0;
14321432
#ifdef CONFIG_IPV6_PIMSM_V2
14331433
add_proto_fail:

‎net/ipv6/route.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4105,9 +4105,9 @@ int __init ip6_route_init(void)
41054105
goto fib6_rules_init;
41064106

41074107
ret = -ENOBUFS;
4108-
if (__rtnl_register(PF_INET6, RTM_NEWROUTE, inet6_rtm_newroute, NULL, NULL) ||
4109-
__rtnl_register(PF_INET6, RTM_DELROUTE, inet6_rtm_delroute, NULL, NULL) ||
4110-
__rtnl_register(PF_INET6, RTM_GETROUTE, inet6_rtm_getroute, NULL, NULL))
4108+
if (__rtnl_register(PF_INET6, RTM_NEWROUTE, inet6_rtm_newroute, NULL, 0) ||
4109+
__rtnl_register(PF_INET6, RTM_DELROUTE, inet6_rtm_delroute, NULL, 0) ||
4110+
__rtnl_register(PF_INET6, RTM_GETROUTE, inet6_rtm_getroute, NULL, 0))
41114111
goto out_register_late_subsys;
41124112

41134113
ret = register_netdevice_notifier(&ip6_route_dev_notifier);

‎net/mpls/af_mpls.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2479,12 +2479,12 @@ static int __init mpls_init(void)
24792479

24802480
rtnl_af_register(&mpls_af_ops);
24812481

2482-
rtnl_register(PF_MPLS, RTM_NEWROUTE, mpls_rtm_newroute, NULL, NULL);
2483-
rtnl_register(PF_MPLS, RTM_DELROUTE, mpls_rtm_delroute, NULL, NULL);
2482+
rtnl_register(PF_MPLS, RTM_NEWROUTE, mpls_rtm_newroute, NULL, 0);
2483+
rtnl_register(PF_MPLS, RTM_DELROUTE, mpls_rtm_delroute, NULL, 0);
24842484
rtnl_register(PF_MPLS, RTM_GETROUTE, mpls_getroute, mpls_dump_routes,
2485-
NULL);
2485+
0);
24862486
rtnl_register(PF_MPLS, RTM_GETNETCONF, mpls_netconf_get_devconf,
2487-
mpls_netconf_dump_devconf, NULL);
2487+
mpls_netconf_dump_devconf, 0);
24882488
err = 0;
24892489
out:
24902490
return err;

‎net/phonet/pn_netlink.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,15 +300,15 @@ static int route_dumpit(struct sk_buff *skb, struct netlink_callback *cb)
300300
int __init phonet_netlink_register(void)
301301
{
302302
int err = __rtnl_register(PF_PHONET, RTM_NEWADDR, addr_doit,
303-
NULL, NULL);
303+
NULL, 0);
304304
if (err)
305305
return err;
306306

307307
/* Further __rtnl_register() cannot fail */
308-
__rtnl_register(PF_PHONET, RTM_DELADDR, addr_doit, NULL, NULL);
309-
__rtnl_register(PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit, NULL);
310-
__rtnl_register(PF_PHONET, RTM_NEWROUTE, route_doit, NULL, NULL);
311-
__rtnl_register(PF_PHONET, RTM_DELROUTE, route_doit, NULL, NULL);
312-
__rtnl_register(PF_PHONET, RTM_GETROUTE, NULL, route_dumpit, NULL);
308+
__rtnl_register(PF_PHONET, RTM_DELADDR, addr_doit, NULL, 0);
309+
__rtnl_register(PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit, 0);
310+
__rtnl_register(PF_PHONET, RTM_NEWROUTE, route_doit, NULL, 0);
311+
__rtnl_register(PF_PHONET, RTM_DELROUTE, route_doit, NULL, 0);
312+
__rtnl_register(PF_PHONET, RTM_GETROUTE, NULL, route_dumpit, 0);
313313
return 0;
314314
}

‎net/qrtr/qrtr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ static int __init qrtr_proto_init(void)
10811081
return rc;
10821082
}
10831083

1084-
rtnl_register(PF_QIPCRTR, RTM_NEWADDR, qrtr_addr_doit, NULL, NULL);
1084+
rtnl_register(PF_QIPCRTR, RTM_NEWADDR, qrtr_addr_doit, NULL, 0);
10851085

10861086
return 0;
10871087
}

‎net/sched/act_api.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,10 +1255,10 @@ static int tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
12551255

12561256
static int __init tc_action_init(void)
12571257
{
1258-
rtnl_register(PF_UNSPEC, RTM_NEWACTION, tc_ctl_action, NULL, NULL);
1259-
rtnl_register(PF_UNSPEC, RTM_DELACTION, tc_ctl_action, NULL, NULL);
1258+
rtnl_register(PF_UNSPEC, RTM_NEWACTION, tc_ctl_action, NULL, 0);
1259+
rtnl_register(PF_UNSPEC, RTM_DELACTION, tc_ctl_action, NULL, 0);
12601260
rtnl_register(PF_UNSPEC, RTM_GETACTION, tc_ctl_action, tc_dump_action,
1261-
NULL);
1261+
0);
12621262

12631263
return 0;
12641264
}

0 commit comments

Comments
 (0)