1 files changed, 10 insertions, 10 deletions

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 02872ae8a439..0dae48aa1cec 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -184,7 +184,7 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int
         if (dev == NULL)
                 return NULL;
 
-        nt = dev->priv;
+        nt = netdev_priv(dev);
         dev->init = ipip6_tunnel_init;
         nt->parms = *parms;
 
@@ -210,7 +210,7 @@ static void ipip6_tunnel_uninit(struct net_device *dev)
                 write_unlock_bh(&ipip6_lock);
                 dev_put(dev);
         } else {
-                ipip6_tunnel_unlink((struct ip_tunnel*)dev->priv);
+                ipip6_tunnel_unlink(netdev_priv(dev));
                 dev_put(dev);
         }
 }
@@ -346,7 +346,7 @@ out:
                 rt6i = rt6_lookup(&iph6->daddr, &iph6->saddr, NULL, 0);
 
                 if (rt6i && rt6i->rt6i_dev && rt6i->rt6i_dev->type == ARPHRD_SIT) {
-                        struct ip_tunnel * t = (struct ip_tunnel*)rt6i->rt6i_dev->priv;
+                        struct ip_tunnel *t = netdev_priv(rt6i->rt6i_dev);
                         if (rel_type == ICMPV6_TIME_EXCEED && t->parms.iph.ttl) {
                                 rel_type = ICMPV6_DEST_UNREACH;
                                 rel_code = ICMPV6_ADDR_UNREACH;
@@ -424,7 +424,7 @@ static inline u32 try_6to4(struct in6_addr *v6dst)
 
 static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct ip_tunnel *tunnel = (struct ip_tunnel*)dev->priv;
+        struct ip_tunnel *tunnel = netdev_priv(dev);
         struct net_device_stats *stats = &tunnel->stat;
         struct iphdr  *tiph = &tunnel->parms.iph;
         struct ipv6hdr *iph6 = skb->nh.ipv6h;
@@ -610,7 +610,7 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
                         t = ipip6_tunnel_locate(&p, 0);
                 }
                 if (t == NULL)
-                        t = (struct ip_tunnel*)dev->priv;
+                        t = netdev_priv(dev);
                 memcpy(&p, &t->parms, sizeof(p));
                 if (copy_to_user(ifr->ifr_ifru.ifru_data, &p, sizeof(p)))
                         err = -EFAULT;
@@ -647,7 +647,7 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
                                         err = -EINVAL;
                                         break;
                                 }
-                                t = (struct ip_tunnel*)dev->priv;
+                                t = netdev_priv(dev);
                                 ipip6_tunnel_unlink(t);
                                 t->parms.iph.saddr = p.iph.saddr;
                                 t->parms.iph.daddr = p.iph.daddr;
@@ -683,7 +683,7 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd)
                         if ((t = ipip6_tunnel_locate(&p, 0)) == NULL)
                                 goto done;
                         err = -EPERM;
-                        if (t == ipip6_fb_tunnel_dev->priv)
+                        if (t == netdev_priv(ipip6_fb_tunnel_dev))
                                 goto done;
                         dev = t->dev;
                 }
@@ -700,7 +700,7 @@ done:
 
 static struct net_device_stats *ipip6_tunnel_get_stats(struct net_device *dev)
 {
-        return &(((struct ip_tunnel*)dev->priv)->stat);
+        return &(((struct ip_tunnel*)netdev_priv(dev))->stat);
 }
 
 static int ipip6_tunnel_change_mtu(struct net_device *dev, int new_mtu)
@@ -735,7 +735,7 @@ static int ipip6_tunnel_init(struct net_device *dev)
         struct ip_tunnel *tunnel;
         struct iphdr *iph;
 
-        tunnel = (struct ip_tunnel*)dev->priv;
+        tunnel = netdev_priv(dev);
         iph = &tunnel->parms.iph;
 
         tunnel->dev = dev;
@@ -775,7 +775,7 @@ static int ipip6_tunnel_init(struct net_device *dev)
 
 static int __init ipip6_fb_tunnel_init(struct net_device *dev)
 {
-        struct ip_tunnel *tunnel = dev->priv;
+        struct ip_tunnel *tunnel = netdev_priv(dev);
         struct iphdr *iph = &tunnel->parms.iph;
 
         tunnel->dev = dev;