net: always pass struct netdev_notifier_info to netdevice notifiers

[karo-tx-linux.git] / net / ipv6 / netfilter / ip6t_MASQUERADE.c

diff --git a/net/ipv6/netfilter/ip6t_MASQUERADE.c b/net/ipv6/netfilter/ip6t_MASQUERADE.c
index 60e9053bab051abb1e69aadabcf36f39292d8e03..47bff610751922ebd80b21eb59387a334af9b3fb 100644 (file)
--- a/net/ipv6/netfilter/ip6t_MASQUERADE.c
+++ b/net/ipv6/netfilter/ip6t_MASQUERADE.c
@@ -71,7 +71,7 @@ static int device_cmp(struct nf_conn *ct, void *ifindex)
 static int masq_device_event(struct notifier_block *this,
                             unsigned long event, void *ptr)
 {
-       const struct net_device *dev = ptr;
+       const struct net_device *dev = netdev_notifier_info_to_dev(ptr);
        struct net *net = dev_net(dev);
 
        if (event == NETDEV_DOWN)
@@ -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 = {