[BRIDGE]: Use rtnl registration interface (32fe21c0) · Commits · 戴 / test

net/bridge/br.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -47,7 +47,10 @@ static int __init br_init(void)
		if (err)
		goto err_out2;

		br_netlink_init();
		err = br_netlink_init();
		if (err)
		goto err_out3;

		brioctl_set(br_ioctl_deviceless_stub);
		br_handle_frame_hook = br_handle_frame;

		@@ -55,7 +58,8 @@ static int __init br_init(void)
		br_fdb_put_hook = br_fdb_put;

		return 0;

		err_out3:
		unregister_netdevice_notifier(&br_device_notifier);
		err_out2:
		br_netfilter_fini();
		err_out1:

+10 −10

Original line number	Diff line number	Diff line
		@@ -11,8 +11,7 @@
		*/

		#include <linux/kernel.h>
		#include <linux/rtnetlink.h>
		#include <net/netlink.h>
		#include <net/rtnetlink.h>
		#include "br_private.h"

		static inline size_t br_nlmsg_size(void)
		@@ -179,18 +178,19 @@ static int br_rtm_setlink(struct sk_buff skb, struct nlmsghdr nlh, void *arg)
		}


		static struct rtnetlink_link bridge_rtnetlink_table[RTM_NR_MSGTYPES] = {
		[RTM_GETLINK - RTM_BASE] = { .dumpit = br_dump_ifinfo, },
		[RTM_SETLINK - RTM_BASE] = { .doit = br_rtm_setlink, },
		};

		void __init br_netlink_init(void)
		int __init br_netlink_init(void)
		{
		rtnetlink_links[PF_BRIDGE] = bridge_rtnetlink_table;
		if (__rtnl_register(PF_BRIDGE, RTM_GETLINK, NULL, br_dump_ifinfo))
		return -ENOBUFS;

		/* Only the first call to __rtnl_register can fail */
		__rtnl_register(PF_BRIDGE, RTM_SETLINK, br_rtm_setlink, NULL);

		return 0;
		}

		void __exit br_netlink_fini(void)
		{
		rtnetlink_links[PF_BRIDGE] = NULL;
		rtnl_unregister_all(PF_BRIDGE);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ extern void (br_fdb_put_hook)(struct net_bridge_fdb_entry ent);


		/* br_netlink.c */
		extern void br_netlink_init(void);
		extern int br_netlink_init(void);
		extern void br_netlink_fini(void);
		extern void br_ifinfo_notify(int event, struct net_bridge_port *port);