[IPv6]: Use rtnl registration interface (c127ea2c) · Commits · 戴 / test

include/net/ip6_fib.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -219,8 +219,6 @@ extern void fib6_init(void);

		extern void fib6_rules_init(void);
		extern void fib6_rules_cleanup(void);
		extern int fib6_rules_dump(struct sk_buff *,
		struct netlink_callback *);

		#endif
		#endif

include/net/ip6_route.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -116,12 +116,7 @@ extern void rt6_pmtu_discovery(struct in6_addr *daddr,
		struct net_device *dev,
		u32 pmtu);

		struct nlmsghdr;
		struct netlink_callback;
		extern int inet6_dump_fib(struct sk_buff skb, struct netlink_callback cb);
		extern int inet6_rtm_newroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg);
		extern int inet6_rtm_delroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg);
		extern int inet6_rtm_getroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg);

		struct rt6_rtnl_dump_arg
		{

net/ipv6/addrconf.c

+16 −19

Original line number	Diff line number	Diff line
		@@ -3613,23 +3613,6 @@ errout:
		rtnl_set_sk_err(RTNLGRP_IPV6_PREFIX, err);
		}

		static struct rtnetlink_link inet6_rtnetlink_table[RTM_NR_MSGTYPES] = {
		[RTM_GETLINK - RTM_BASE] = { .dumpit = inet6_dump_ifinfo, },
		[RTM_NEWADDR - RTM_BASE] = { .doit = inet6_rtm_newaddr, },
		[RTM_DELADDR - RTM_BASE] = { .doit = inet6_rtm_deladdr, },
		[RTM_GETADDR - RTM_BASE] = { .doit = inet6_rtm_getaddr,
		.dumpit = inet6_dump_ifaddr, },
		[RTM_GETMULTICAST - RTM_BASE] = { .dumpit = inet6_dump_ifmcaddr, },
		[RTM_GETANYCAST - RTM_BASE] = { .dumpit = inet6_dump_ifacaddr, },
		[RTM_NEWROUTE - RTM_BASE] = { .doit = inet6_rtm_newroute, },
		[RTM_DELROUTE - RTM_BASE] = { .doit = inet6_rtm_delroute, },
		[RTM_GETROUTE - RTM_BASE] = { .doit = inet6_rtm_getroute,
		.dumpit = inet6_dump_fib, },
		#ifdef CONFIG_IPV6_MULTIPLE_TABLES
		[RTM_GETRULE - RTM_BASE] = { .dumpit = fib6_rules_dump, },
		#endif
		};

		static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
		{
		inet6_ifa_notify(event ? : RTM_NEWADDR, ifp);
		@@ -4149,7 +4132,18 @@ int __init addrconf_init(void)
		register_netdevice_notifier(&ipv6_dev_notf);

		addrconf_verify(0);
		rtnetlink_links[PF_INET6] = inet6_rtnetlink_table;

		err = __rtnl_register(PF_INET6, RTM_GETLINK, NULL, inet6_dump_ifinfo);
		if (err < 0)
		goto errout;

		/* Only the first call to __rtnl_register can fail */
		__rtnl_register(PF_INET6, RTM_NEWADDR, inet6_rtm_newaddr, NULL);
		__rtnl_register(PF_INET6, RTM_DELADDR, inet6_rtm_deladdr, NULL);
		__rtnl_register(PF_INET6, RTM_GETADDR, inet6_rtm_getaddr, inet6_dump_ifaddr);
		__rtnl_register(PF_INET6, RTM_GETMULTICAST, NULL, inet6_dump_ifmcaddr);
		__rtnl_register(PF_INET6, RTM_GETANYCAST, NULL, inet6_dump_ifacaddr);

		#ifdef CONFIG_SYSCTL
		addrconf_sysctl.sysctl_header =
		register_sysctl_table(addrconf_sysctl.addrconf_root_dir);
		@@ -4157,6 +4151,10 @@ int __init addrconf_init(void)
		#endif

		return 0;
		errout:
		unregister_netdevice_notifier(&ipv6_dev_notf);

		return err;
		}

		void __exit addrconf_cleanup(void)
		@@ -4168,7 +4166,6 @@ void __exit addrconf_cleanup(void)

		unregister_netdevice_notifier(&ipv6_dev_notf);

		rtnetlink_links[PF_INET6] = NULL;
		#ifdef CONFIG_SYSCTL
		addrconf_sysctl_unregister(&ipv6_devconf_dflt);
		addrconf_sysctl_unregister(&ipv6_devconf);

net/ipv6/af_inet6.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -945,6 +945,8 @@ static void __exit inet6_exit(void)
		{
		/* First of all disallow new sockets creation. */
		sock_unregister(PF_INET6);
		/* Disallow any further netlink messages */
		rtnl_unregister_all(PF_INET6);

		/* Cleanup code parts. */
		ipv6_packet_cleanup();

net/ipv6/fib6_rules.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ nla_put_failure:
		return -ENOBUFS;
		}

		int fib6_rules_dump(struct sk_buff skb, struct netlink_callback cb)
		static int fib6_rules_dump(struct sk_buff skb, struct netlink_callback cb)
		{
		return fib_rules_dump(skb, cb, AF_INET6);
		}
		@@ -255,9 +255,11 @@ void __init fib6_rules_init(void)
		list_add_tail(&main_rule.common.list, &fib6_rules);

		fib_rules_register(&fib6_rules_ops);
		__rtnl_register(PF_INET6, RTM_GETRULE, NULL, fib6_rules_dump);
		}

		void fib6_rules_cleanup(void)
		{
		rtnl_unregister(PF_INET6, RTM_GETRULE);
		fib_rules_unregister(&fib6_rules_ops);
		}

Admin message