X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fcore%2Fdev.c;h=e5e23d78545488d12b5e7828f84f41593504baab;hb=56a4342dfe3145cd66f766adccb28fd9b571606d;hp=153ee2f8c33e813317ccfd20304e89e85305716f;hpb=805c1f4aedaba1bc8d839e7c27b128083dd5c2f0;p=~andy%2Flinux

diff --git a/net/core/dev.c b/net/core/dev.c
index 153ee2f8c33..e5e23d78545 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4446,7 +4446,7 @@ struct net_device *netdev_all_upper_get_next_dev_rcu(struct net_device *dev,
 {
 	struct netdev_adjacent *upper;
 
-	WARN_ON_ONCE(!rcu_read_lock_held());
+	WARN_ON_ONCE(!rcu_read_lock_held() && !lockdep_rtnl_is_held());
 
 	upper = list_entry_rcu((*iter)->next, struct netdev_adjacent, list);