5 files changed, 15 insertions, 11 deletions

diff --git a/net/atm/clip.c b/net/atm/clip.c
index cce241eb01d9..8215f7cb170b 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -575,6 +575,7 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,
                            void *ifa)
 {
         struct in_device *in_dev;
+        struct netdev_notifier_info info;
 
         in_dev = ((struct in_ifaddr *)ifa)->ifa_dev;
         /*
@@ -583,7 +584,8 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,
          */
         if (event != NETDEV_UP)
                 return NOTIFY_DONE;
-        return clip_device_event(this, NETDEV_CHANGE, in_dev->dev);
+        netdev_notifier_info_init(&info, in_dev->dev);
+        return clip_device_event(this, NETDEV_CHANGE, &info);
 }
 
 static struct notifier_block clip_dev_notifier = {
diff --git a/net/core/dev.c b/net/core/dev.c
index 6eb621cc3b81..b2e9057be3bf 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1391,12 +1391,6 @@ void dev_disable_lro(struct net_device *dev)
 }
 EXPORT_SYMBOL(dev_disable_lro);
 
-static void netdev_notifier_info_init(struct netdev_notifier_info *info,
-                                      struct net_device *dev)
-{
-        info->dev = dev;
-}
-
 static int call_netdevice_notifier(struct notifier_block *nb, unsigned long val,
                                    struct net_device *dev)
 {
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index dd5508bde799..30e4de940567 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -129,7 +129,10 @@ static int masq_inet_event(struct notifier_block *this,
                            void *ptr)
 {
         struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
-        return masq_device_event(this, event, dev);
+        struct netdev_notifier_info info;
+
+        netdev_notifier_info_init(&info, dev);
+        return masq_device_event(this, event, &info);
 }
 
 static struct notifier_block masq_dev_notifier = {
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index bce073b4bbd4..7b34f06af344 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4645,13 +4645,16 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write,
 
 static void dev_disable_change(struct inet6_dev *idev)
 {
+        struct netdev_notifier_info info;
+
         if (!idev || !idev->dev)
                 return;
 
+        netdev_notifier_info_init(&info, idev->dev);
         if (idev->cnf.disable_ipv6)
-                addrconf_notify(NULL, NETDEV_DOWN, idev->dev);
+                addrconf_notify(NULL, NETDEV_DOWN, &info);
         else
-                addrconf_notify(NULL, NETDEV_UP, idev->dev);
+                addrconf_notify(NULL, NETDEV_UP, &info);
 }
 
 static void addrconf_disable_change(struct net *net, __s32 newf)
diff --git a/net/ipv6/netfilter/ip6t_MASQUERADE.c b/net/ipv6/netfilter/ip6t_MASQUERADE.c
index b76257cd7e1e..47bff6107519 100644
--- a/net/ipv6/netfilter/ip6t_MASQUERADE.c
+++ b/net/ipv6/netfilter/ip6t_MASQUERADE.c
@@ -89,8 +89,10 @@ static int masq_inet_event(struct notifier_block *this,
                            unsigned long event, void *ptr)
 {
         struct inet6_ifaddr *ifa = ptr;
+        struct netdev_notifier_info info;
 
-        return masq_device_event(this, event, ifa->idev->dev);
+        netdev_notifier_info_init(&info, ifa->idev->dev);
+        return masq_device_event(this, event, &info);
 }
 
 static struct notifier_block masq_inet_notifier = {