diff options
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 24 | 
1 files changed, 3 insertions, 21 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index a459c4f5b76..dae802c0af7 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -168,8 +168,6 @@ static void inet6_prefix_notify(int event, struct inet6_dev *idev,  static bool ipv6_chk_same_addr(struct net *net, const struct in6_addr *addr,  			       struct net_device *dev); -static ATOMIC_NOTIFIER_HEAD(inet6addr_chain); -  static struct ipv6_devconf ipv6_devconf __read_mostly = {  	.forwarding		= 0,  	.hop_limit		= IPV6_DEFAULT_HOPLIMIT, @@ -837,7 +835,7 @@ out2:  	rcu_read_unlock_bh();  	if (likely(err == 0)) -		atomic_notifier_call_chain(&inet6addr_chain, NETDEV_UP, ifa); +		inet6addr_notifier_call_chain(NETDEV_UP, ifa);  	else {  		kfree(ifa);  		ifa = ERR_PTR(err); @@ -927,7 +925,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp)  	ipv6_ifa_notify(RTM_DELADDR, ifp); -	atomic_notifier_call_chain(&inet6addr_chain, NETDEV_DOWN, ifp); +	inet6addr_notifier_call_chain(NETDEV_DOWN, ifp);  	/*  	 * Purge or update corresponding prefix @@ -2988,7 +2986,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)  		if (state != INET6_IFADDR_STATE_DEAD) {  			__ipv6_ifa_notify(RTM_DELADDR, ifa); -			atomic_notifier_call_chain(&inet6addr_chain, NETDEV_DOWN, ifa); +			inet6addr_notifier_call_chain(NETDEV_DOWN, ifa);  		}  		in6_ifa_put(ifa); @@ -4869,22 +4867,6 @@ static struct pernet_operations addrconf_ops = {  	.exit = addrconf_exit_net,  }; -/* - *      Device notifier - */ - -int register_inet6addr_notifier(struct notifier_block *nb) -{ -	return atomic_notifier_chain_register(&inet6addr_chain, nb); -} -EXPORT_SYMBOL(register_inet6addr_notifier); - -int unregister_inet6addr_notifier(struct notifier_block *nb) -{ -	return atomic_notifier_chain_unregister(&inet6addr_chain, nb); -} -EXPORT_SYMBOL(unregister_inet6addr_notifier); -  static struct rtnl_af_ops inet6_ops = {  	.family		  = AF_INET6,  	.fill_link_af	  = inet6_fill_link_af,  |