Merge branch 'master' into upstream

1 files changed, 7 insertions, 6 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 3d71251b3eca..44f1b673f916 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -61,6 +61,9 @@ extern int			addrconf_set_dstaddr(void __user *arg);
 extern int                      ipv6_chk_addr(struct in6_addr *addr,
                                               struct net_device *dev,
                                               int strict);
+#ifdef CONFIG_IPV6_MIP6
+extern int                      ipv6_chk_home_addr(struct in6_addr *addr);
+#endif
 extern struct inet6_ifaddr *    ipv6_get_ifaddr(struct in6_addr *addr,
                                                 struct net_device *dev,
                                                 int strict);
@@ -126,20 +129,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;
 }