diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-19 19:23:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-19 19:23:54 -0500 |
| commit | b1aca94efa566551e3ea5ed6ee4adc068ae86d1c (patch) | |
| tree | 703dc5dc03ed86e3a266ff86d88861d076928639 /net | |
| parent | 1a1f20bc9debd133549d5b289bd5494a4264a73d (diff) | |
| parent | 8f48f5bc759d6f945ff0c3b2bf2a1d5971e561ba (diff) | |
| download | linux-b1aca94efa566551e3ea5ed6ee4adc068ae86d1c.tar.gz linux-b1aca94efa566551e3ea5ed6ee4adc068ae86d1c.tar.bz2 linux-b1aca94efa566551e3ea5ed6ee4adc068ae86d1c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates
This series contains updates to net, ixgbe and e1000e.
David provides compiler fixes for e1000e.
Don provides a fix for ixgbe to resolve a compile warning.
John provides a fix to net where it is useful to be able to walk all
upper devices when bringing a device online where the RTNL lock is held.
In this case, it is safe to walk the all_adj_list because the RTNL lock is
used to protect the write side as well. This patch adds a check to see
if the RTNL lock is held before throwing a warning in
netdev_all_upper_get_next_dev_rcu().
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ba3b7ea5ebb3..4fc17221545d 100644 --- 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); |