ipv4: ip_ptr cleanups

dev->ip_ptr is protected by rtnl and rcu.

Yet some places dont use appropriate primitives and/or locking rules.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index f7b33ae7a70..b5e120b0074 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -1504,22 +1504,25 @@ struct velocity_info {
  *      addresses on this chain then we use the first - multi-IP WOL is not
  *      supported.
  *
- *      CHECK ME: locking
  */
 
 static inline int velocity_get_ip(struct velocity_info *vptr)
 {
-        struct in_device *in_dev = (struct in_device *) vptr->dev->ip_ptr;
+        struct in_device *in_dev;
         struct in_ifaddr *ifa;
+        int res = -ENOENT;
 
+        rcu_read_lock();
+        in_dev = __in_dev_get_rcu(vptr->dev);
         if (in_dev != NULL) {
                 ifa = (struct in_ifaddr *) in_dev->ifa_list;
                 if (ifa != NULL) {
                         memcpy(vptr->ip_addr, &ifa->ifa_address, 4);
-                        return 0;
+                        res = 0;
                 }
         }
-        return -ENOENT;
+        rcu_read_unlock();
+        return res;
 }
 
 /**