[PATCH] sch_htb compile fix.

[powerpc.git] / net / ipv4 / devinet.c

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 3ffa60d..a7c65e9 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -27,7 +27,6 @@
  *                                     if no match found.
  */
 
-#include <linux/config.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -81,7 +80,7 @@ static struct ipv4_devconf ipv4_devconf_dflt = {
 
 static void rtmsg_ifa(int event, struct in_ifaddr *);
 
-static struct notifier_block *inetaddr_chain;
+static BLOCKING_NOTIFIER_HEAD(inetaddr_chain);
 static void inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,
                         int destroy);
 #ifdef CONFIG_SYSCTL
@@ -267,7 +266,8 @@ static void inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,
                                *ifap1 = ifa->ifa_next;
 
                                rtmsg_ifa(RTM_DELADDR, ifa);
-                               notifier_call_chain(&inetaddr_chain, NETDEV_DOWN, ifa);
+                               blocking_notifier_call_chain(&inetaddr_chain,
+                                               NETDEV_DOWN, ifa);
                                inet_free_ifa(ifa);
                        } else {
                                promote = ifa;
@@ -291,7 +291,7 @@ static void inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,
           So that, this order is correct.
         */
        rtmsg_ifa(RTM_DELADDR, ifa1);
-       notifier_call_chain(&inetaddr_chain, NETDEV_DOWN, ifa1);
+       blocking_notifier_call_chain(&inetaddr_chain, NETDEV_DOWN, ifa1);
 
        if (promote) {
 
@@ -303,7 +303,8 @@ static void inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap,
 
                promote->ifa_flags &= ~IFA_F_SECONDARY;
                rtmsg_ifa(RTM_NEWADDR, promote);
-               notifier_call_chain(&inetaddr_chain, NETDEV_UP, promote);
+               blocking_notifier_call_chain(&inetaddr_chain,
+                               NETDEV_UP, promote);
                for (ifa = promote->ifa_next; ifa; ifa = ifa->ifa_next) {
                        if (ifa1->ifa_mask != ifa->ifa_mask ||
                            !inet_ifa_match(ifa1->ifa_address, ifa))
@@ -366,7 +367,7 @@ static int inet_insert_ifa(struct in_ifaddr *ifa)
           Notifier will trigger FIB update, so that
           listeners of netlink will know about new ifaddr */
        rtmsg_ifa(RTM_NEWADDR, ifa);
-       notifier_call_chain(&inetaddr_chain, NETDEV_UP, ifa);
+       blocking_notifier_call_chain(&inetaddr_chain, NETDEV_UP, ifa);
 
        return 0;
 }
@@ -938,12 +939,12 @@ u32 inet_confirm_addr(const struct net_device *dev, u32 dst, u32 local, int scop
 
 int register_inetaddr_notifier(struct notifier_block *nb)
 {
-       return notifier_chain_register(&inetaddr_chain, nb);
+       return blocking_notifier_chain_register(&inetaddr_chain, nb);
 }
 
 int unregister_inetaddr_notifier(struct notifier_block *nb)
 {
-       return notifier_chain_unregister(&inetaddr_chain, nb);
+       return blocking_notifier_chain_unregister(&inetaddr_chain, nb);
 }
 
 /* Rename ifa_labels for a device name change. Make some effort to preserve existing
@@ -1393,6 +1394,14 @@ static struct devinet_sysctl_table {
                        .mode           = 0644,
                        .proc_handler   = &proc_dointvec,
                },
+               {
+                       .ctl_name       = NET_IPV4_CONF_ARP_ACCEPT,
+                       .procname       = "arp_accept",
+                       .data           = &ipv4_devconf.arp_accept,
+                       .maxlen         = sizeof(int),
+                       .mode           = 0644,
+                       .proc_handler   = &proc_dointvec,
+               },
                {
                        .ctl_name       = NET_IPV4_CONF_NOXFRM,
                        .procname       = "disable_xfrm",
@@ -1546,7 +1555,6 @@ void __init devinet_init(void)
 #endif
 }
 
-EXPORT_SYMBOL(devinet_ioctl);
 EXPORT_SYMBOL(in_dev_finish_destroy);
 EXPORT_SYMBOL(inet_select_addr);
 EXPORT_SYMBOL(inetdev_by_index);