2 files changed, 5 insertions, 6 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 5fc8627435eb..aa2ed8f0a9dd 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -133,20 +133,18 @@ extern int unregister_inet6addr_notifier(struct notifier_block *nb);
 static inline struct inet6_dev *
 __in6_dev_get(struct net_device *dev)
 {
-        return (struct inet6_dev *)dev->ip6_ptr;
+        return rcu_dereference(dev->ip6_ptr);
 }
 
-extern rwlock_t addrconf_lock;
-
 static inline struct inet6_dev *
 in6_dev_get(struct net_device *dev)
 {
         struct inet6_dev *idev = NULL;
-        read_lock(&addrconf_lock);
-        idev = dev->ip6_ptr;
+        rcu_read_lock();
+        idev = __in6_dev_get(dev);
         if (idev)
                 atomic_inc(&idev->refcnt);
-        read_unlock(&addrconf_lock);
+        rcu_read_unlock();
         return idev;
 }
 
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index e459e1a0ae4a..34489c13c119 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -189,6 +189,7 @@ struct inet6_dev
         struct ipv6_devconf     cnf;
         struct ipv6_devstat     stats;
         unsigned long           tstamp; /* ipv6InterfaceTable update timestamp */
+        struct rcu_head         rcu;
 };
 
 extern struct ipv6_devconf ipv6_devconf;