Signed-off-by: Thomas Graf Index: net-2.6.22/include/net/ip6_fib.h =================================================================== --- net-2.6.22.orig/include/net/ip6_fib.h 2007-03-20 23:53:20.000000000 +0100 +++ net-2.6.22/include/net/ip6_fib.h 2007-03-21 00:52:40.000000000 +0100 @@ -218,8 +218,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 Index: net-2.6.22/net/ipv6/addrconf.c =================================================================== --- net-2.6.22.orig/net/ipv6/addrconf.c 2007-03-20 23:53:20.000000000 +0100 +++ net-2.6.22/net/ipv6/addrconf.c 2007-03-21 00:52:40.000000000 +0100 @@ -2948,8 +2948,7 @@ static struct nla_policy ifa_ipv6_policy [IFA_CACHEINFO] = { .len = sizeof(struct ifa_cacheinfo) }, }; -static int -inet6_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) +static int nl_addr_del(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) { struct ifaddrmsg *ifm; struct nlattr *tb[IFA_MAX+1]; @@ -3005,8 +3004,7 @@ static int inet6_addr_modify(struct inet return 0; } -static int -inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) +static int nl_addr_new(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) { struct ifaddrmsg *ifm; struct nlattr *tb[IFA_MAX+1]; @@ -3287,27 +3285,26 @@ done: return skb->len; } -static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) +static int nl_addr_dump(struct sk_buff *skb, struct netlink_callback *cb) { enum addr_type_t type = UNICAST_ADDR; return inet6_dump_addr(skb, cb, type); } -static int inet6_dump_ifmcaddr(struct sk_buff *skb, struct netlink_callback *cb) +static int nl_mcaddr_dump(struct sk_buff *skb, struct netlink_callback *cb) { enum addr_type_t type = MULTICAST_ADDR; return inet6_dump_addr(skb, cb, type); } -static int inet6_dump_ifacaddr(struct sk_buff *skb, struct netlink_callback *cb) +static int nl_acaddr_dump(struct sk_buff *skb, struct netlink_callback *cb) { enum addr_type_t type = ANYCAST_ADDR; return inet6_dump_addr(skb, cb, type); } -static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr* nlh, - void *arg) +static int nl_addr_get(struct sk_buff *in_skb, struct nlmsghdr* nlh, void *arg) { struct ifaddrmsg *ifm; struct nlattr *tb[IFA_MAX+1]; @@ -3491,7 +3488,7 @@ nla_put_failure: return -EMSGSIZE; } -static int inet6_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) +static int nl_link_dump(struct sk_buff *skb, struct netlink_callback *cb) { int idx, err; int s_idx = cb->args[0]; @@ -3607,23 +3604,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); @@ -4135,7 +4115,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, nl_link_dump); + if (err < 0) + goto errout; + + /* Only the first call to __rtnl_register can fail */ + __rtnl_register(PF_INET6, RTM_NEWADDR, nl_addr_new, NULL); + __rtnl_register(PF_INET6, RTM_DELADDR, nl_addr_del, NULL); + __rtnl_register(PF_INET6, RTM_GETADDR, nl_addr_get, nl_addr_dump); + __rtnl_register(PF_INET6, RTM_GETMULTICAST, NULL, nl_mcaddr_dump); + __rtnl_register(PF_INET6, RTM_GETANYCAST, NULL, nl_acaddr_dump); + #ifdef CONFIG_SYSCTL addrconf_sysctl.sysctl_header = register_sysctl_table(addrconf_sysctl.addrconf_root_dir); @@ -4143,6 +4134,10 @@ int __init addrconf_init(void) #endif return 0; +errout: + unregister_netdevice_notifier(&ipv6_dev_notf); + + return err; } void __exit addrconf_cleanup(void) @@ -4154,7 +4149,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); Index: net-2.6.22/net/ipv6/fib6_rules.c =================================================================== --- net-2.6.22.orig/net/ipv6/fib6_rules.c 2007-03-20 23:53:21.000000000 +0100 +++ net-2.6.22/net/ipv6/fib6_rules.c 2007-03-21 00:52:40.000000000 +0100 @@ -221,7 +221,7 @@ nla_put_failure: return -ENOBUFS; } -int fib6_rules_dump(struct sk_buff *skb, struct netlink_callback *cb) +static int nl_fib6_rules_dump(struct sk_buff *skb, struct netlink_callback *cb) { return fib_rules_dump(skb, cb, AF_INET6); } @@ -259,9 +259,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, nl_fib6_rules_dump); } void fib6_rules_cleanup(void) { + rtnl_unregister(PF_INET6, RTM_GETRULE); fib_rules_unregister(&fib6_rules_ops); } Index: net-2.6.22/include/net/ip6_route.h =================================================================== --- net-2.6.22.orig/include/net/ip6_route.h 2007-03-20 23:53:20.000000000 +0100 +++ net-2.6.22/include/net/ip6_route.h 2007-03-21 00:52:40.000000000 +0100 @@ -116,12 +116,7 @@ extern void rt6_pmtu_discovery(struct 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 { Index: net-2.6.22/net/ipv6/route.c =================================================================== --- net-2.6.22.orig/net/ipv6/route.c 2007-03-20 23:53:20.000000000 +0100 +++ net-2.6.22/net/ipv6/route.c 2007-03-21 00:52:40.000000000 +0100 @@ -1994,7 +1994,7 @@ errout: return err; } -int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) +static int nl_route_del(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) { struct fib6_config cfg; int err; @@ -2006,7 +2006,7 @@ int inet6_rtm_delroute(struct sk_buff *s return ip6_route_del(&cfg); } -int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) +static int nl_route_new(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) { struct fib6_config cfg; int err; @@ -2143,7 +2143,7 @@ int rt6_dump_route(struct rt6_info *rt, prefix, NLM_F_MULTI); } -int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void *arg) +static int nl_route_get(struct sk_buff *in_skb, struct nlmsghdr* nlh, void *arg) { struct nlattr *tb[RTA_MAX+1]; struct rt6_info *rt; @@ -2487,6 +2487,10 @@ void __init ip6_route_init(void) #ifdef CONFIG_IPV6_MULTIPLE_TABLES fib6_rules_init(); #endif + + __rtnl_register(PF_INET6, RTM_NEWROUTE, nl_route_new, NULL); + __rtnl_register(PF_INET6, RTM_DELROUTE, nl_route_del, NULL); + __rtnl_register(PF_INET6, RTM_GETROUTE, nl_route_get, NULL); } void ip6_route_cleanup(void) Index: net-2.6.22/net/ipv6/ip6_fib.c =================================================================== --- net-2.6.22.orig/net/ipv6/ip6_fib.c 2007-03-20 23:53:20.000000000 +0100 +++ net-2.6.22/net/ipv6/ip6_fib.c 2007-03-21 00:52:40.000000000 +0100 @@ -359,7 +359,7 @@ end: return res; } -int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) +static int nl_route_dump(struct sk_buff *skb, struct netlink_callback *cb) { unsigned int h, s_h; unsigned int e = 0, s_e; @@ -1478,6 +1478,8 @@ void __init fib6_init(void) NULL, NULL); fib6_tables_init(); + + __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, nl_route_dump); } void fib6_gc_cleanup(void) Index: net-2.6.22/net/ipv6/af_inet6.c =================================================================== --- net-2.6.22.orig/net/ipv6/af_inet6.c 2007-03-20 23:53:20.000000000 +0100 +++ net-2.6.22/net/ipv6/af_inet6.c 2007-03-21 00:52:40.000000000 +0100 @@ -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(); -- - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html