1 files changed, 4 insertions, 7 deletions

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 7c992fbbc2c3..08e8fb60d315 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -292,7 +292,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
 
         mm_segment_t oldfs = get_fs();
         set_fs(get_ds());
-        res = devinet_ioctl(cmd, (struct ifreq __user *) arg);
+        res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
         set_fs(oldfs);
         return res;
 }
@@ -434,7 +434,7 @@ ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
         unsigned char *sha, *tha;               /* s for "source", t for "target" */
         struct ic_device *d;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 goto drop;
 
         if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
@@ -460,10 +460,7 @@ ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
         if (rarp->ar_pro != htons(ETH_P_IP))
                 goto drop;
 
-        if (!pskb_may_pull(skb,
-                           sizeof(struct arphdr) +
-                           (2 * dev->addr_len) +
-                           (2 * 4)))
+        if (!pskb_may_pull(skb, arp_hdr_len(dev)))
                 goto drop;
 
         /* OK, it is all there and looks valid, process... */
@@ -857,7 +854,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
         struct ic_device *d;
         int len, ext_len;
 
-        if (dev->nd_net != &init_net)
+        if (dev_net(dev) != &init_net)
                 goto drop;
 
         /* Perform verifications before taking the lock.  */