net: Add checking to rcu_dereference() primitives

[net-next-2.6.git] / include / net / addrconf.h

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 0f7c37825fc146ae6a8ceee0ce269af3b4ef65eb..45375b41a2a0d44e62a370813ab4fdcbe046e3b3 100644 (file)
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -177,7 +177,9 @@ extern int unregister_inet6addr_notifier(struct notifier_block *nb);
 static inline struct inet6_dev *
 __in6_dev_get(struct net_device *dev)
 {
-       return rcu_dereference(dev->ip6_ptr);
+       return rcu_dereference_check(dev->ip6_ptr,
+                                    rcu_read_lock_held() ||
+                                    lockdep_rtnl_is_held());
 }
 
 static inline struct inet6_dev *