net: always pass struct netdev_notifier_info to netdevice notifiers

[karo-tx-linux.git] / net / atm / clip.c

diff --git a/net/atm/clip.c b/net/atm/clip.c
index 8ae3a7879335f28cc082ea6c2a3bf8da2b8820a3..8215f7cb170b5a21cdb67347f50578f57e515dfb 100644 (file)
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -539,9 +539,9 @@ static int clip_create(int number)
 }
 
 static int clip_device_event(struct notifier_block *this, unsigned long event,
-                            void *arg)
+                            void *ptr)
 {
-       struct net_device *dev = arg;
+       struct net_device *dev = netdev_notifier_info_to_dev(ptr);
 
        if (!net_eq(dev_net(dev), &init_net))
                return NOTIFY_DONE;
@@ -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 = {