[DECNet]: Use rtnl registration interface (fa34ddd7) · Commits · 戴 / test

include/net/dn_fib.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -148,17 +148,8 @@ extern void dn_fib_rules_cleanup(void);
		extern unsigned dnet_addr_type(__le16 addr);
		extern int dn_fib_lookup(struct flowi fl, struct dn_fib_res res);

		/*
		* rtnetlink interface
		*/
		extern int dn_fib_rtm_delroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg);
		extern int dn_fib_rtm_newroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg);
		extern int dn_fib_dump(struct sk_buff skb, struct netlink_callback cb);

		extern int dn_fib_rtm_delrule(struct sk_buff skb, struct nlmsghdr nlh, void *arg);
		extern int dn_fib_rtm_newrule(struct sk_buff skb, struct nlmsghdr nlh, void *arg);
		extern int dn_fib_dump_rules(struct sk_buff skb, struct netlink_callback cb);

		extern void dn_fib_free_info(struct dn_fib_info *fi);

		static inline void dn_fib_info_put(struct dn_fib_info *fi)

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		extern struct sk_buff dn_alloc_skb(struct sock sk, int size, gfp_t pri);
		extern int dn_route_output_sock(struct dst_entry *pprt, struct flowi , struct sock *sk, int flags);
		extern int dn_cache_dump(struct sk_buff skb, struct netlink_callback cb);
		extern int dn_cache_getroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg);
		extern void dn_rt_cache_flush(int delay);

		/* Masks for flags field */

+1 −0

Original line number	Diff line number	Diff line
		@@ -2413,6 +2413,7 @@ module_init(decnet_init);
		static void __exit decnet_exit(void)
		{
		sock_unregister(AF_DECnet);
		rtnl_unregister_all(PF_DECnet);
		dev_remove_pack(&dn_dix_packet_type);

		dn_unregister_sysctl();

+3 −21

Original line number	Diff line number	Diff line
		@@ -1447,24 +1447,6 @@ static const struct file_operations dn_dev_seq_fops = {

		#endif /* CONFIG_PROC_FS */

		static struct rtnetlink_link dnet_rtnetlink_table[RTM_NR_MSGTYPES] =
		{
		[RTM_NEWADDR - RTM_BASE] = { .doit = dn_nl_newaddr, },
		[RTM_DELADDR - RTM_BASE] = { .doit = dn_nl_deladdr, },
		[RTM_GETADDR - RTM_BASE] = { .dumpit = dn_nl_dump_ifaddr, },
		#ifdef CONFIG_DECNET_ROUTER
		[RTM_NEWROUTE - RTM_BASE] = { .doit = dn_fib_rtm_newroute, },
		[RTM_DELROUTE - RTM_BASE] = { .doit = dn_fib_rtm_delroute, },
		[RTM_GETROUTE - RTM_BASE] = { .doit = dn_cache_getroute,
		.dumpit = dn_fib_dump, },
		[RTM_GETRULE - RTM_BASE] = { .dumpit = dn_fib_dump_rules, },
		#else
		[RTM_GETROUTE - RTM_BASE] = { .doit = dn_cache_getroute,
		.dumpit = dn_cache_dump, },
		#endif

		};

		static int __initdata addr[2];
		module_param_array(addr, int, NULL, 0444);
		MODULE_PARM_DESC(addr, "The DECnet address of this machine: area,node");
		@@ -1485,7 +1467,9 @@ void __init dn_dev_init(void)

		dn_dev_devices_on();

		rtnetlink_links[PF_DECnet] = dnet_rtnetlink_table;
		rtnl_register(PF_DECnet, RTM_NEWADDR, dn_nl_newaddr, NULL);
		rtnl_register(PF_DECnet, RTM_DELADDR, dn_nl_deladdr, NULL);
		rtnl_register(PF_DECnet, RTM_GETADDR, NULL, dn_nl_dump_ifaddr);

		proc_net_fops_create("decnet_dev", S_IRUGO, &dn_dev_seq_fops);

		@@ -1500,8 +1484,6 @@ void __init dn_dev_init(void)

		void __exit dn_dev_cleanup(void)
		{
		rtnetlink_links[PF_DECnet] = NULL;

		#ifdef CONFIG_SYSCTL
		{
		int i;

+5 −3

Original line number	Diff line number	Diff line
		@@ -504,7 +504,7 @@ static int dn_fib_check_attr(struct rtmsg r, struct rtattr *rta)
		return 0;
		}

		int dn_fib_rtm_delroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg)
		static int dn_fib_rtm_delroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg)
		{
		struct dn_fib_table *tb;
		struct rtattr **rta = arg;
		@@ -520,7 +520,7 @@ int dn_fib_rtm_delroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg)
		return -ESRCH;
		}

		int dn_fib_rtm_newroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg)
		static int dn_fib_rtm_newroute(struct sk_buff skb, struct nlmsghdr nlh, void *arg)
		{
		struct dn_fib_table *tb;
		struct rtattr **rta = arg;
		@@ -748,11 +748,13 @@ void __exit dn_fib_cleanup(void)

		void __init dn_fib_init(void)
		{

		dn_fib_table_init();
		dn_fib_rules_init();

		register_dnaddr_notifier(&dn_fib_dnaddr_notifier);

		rtnl_register(PF_DECnet, RTM_NEWROUTE, dn_fib_rtm_newroute, NULL);
		rtnl_register(PF_DECnet, RTM_DELROUTE, dn_fib_rtm_delroute, NULL);
		}