1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index ec0349e84a8a..ca4df7f4cf21 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -995,8 +995,10 @@ plip_tx_packet(struct sk_buff *skb, struct net_device *dev)
 static void
 plip_rewrite_address(const struct net_device *dev, struct ethhdr *eth)
 {
-        const struct in_device *in_dev = dev->ip_ptr;
+        const struct in_device *in_dev;
 
+        rcu_read_lock();
+        in_dev = __in_dev_get_rcu(dev);
         if (in_dev) {
                 /* Any address will do - we take the first */
                 const struct in_ifaddr *ifa = in_dev->ifa_list;
@@ -1006,6 +1008,7 @@ plip_rewrite_address(const struct net_device *dev, struct ethhdr *eth)
                         memcpy(eth->h_dest+2, &ifa->ifa_address, 4);
                 }
         }
+        rcu_read_unlock();
 }
 
 static int
@@ -1088,7 +1091,8 @@ plip_open(struct net_device *dev)
            when the device address isn't identical to the address of a
            received frame, the kernel incorrectly drops it).             */
 
-        if ((in_dev=dev->ip_ptr) != NULL) {
+        in_dev=__in_dev_get_rtnl(dev);
+        if (in_dev) {
                 /* Any address will do - we take the first. We already
                    have the first two bytes filled with 0xfc, from
                    plip_init_dev(). */
@@ -1279,7 +1283,6 @@ static void plip_attach (struct parport *port)
                 if (!nl->pardev) {
                         printk(KERN_ERR "%s: parport_register failed\n", name);
                         goto err_free_dev;
-                        return;
                 }
 
                 plip_init_netdev(dev);