Merge tag 'drm-intel-fixes-2014-01-08' of git://people.freedesktop.org/~danvet/drm...

[karo-tx-linux.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index ba3b7ea5ebb3139cca38e82ac6f5f5e346f4a4e0..4fc17221545d403dca7b942ba2f95eb97058fc65 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4500,7 +4500,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);