From: Zhu Yanjun <zyjzyj2...@gmail.com>

Signed-off-by: Zhu Yanjun <zyjzyj2...@gmail.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c 
b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 088c47c..cb19cbc 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6840,7 +6840,7 @@ static void ixgbe_watchdog_link_is_up(struct 
ixgbe_adapter *adapter)
        netif_tx_wake_all_queues(adapter->netdev);
 
        /* enable any upper devices */
-       rtnl_lock();
+       rcu_read_lock();
        netdev_for_each_all_upper_dev_rcu(adapter->netdev, upper, iter) {
                if (netif_is_macvlan(upper)) {
                        struct macvlan_dev *vlan = netdev_priv(upper);
@@ -6849,7 +6849,7 @@ static void ixgbe_watchdog_link_is_up(struct 
ixgbe_adapter *adapter)
                                netif_tx_wake_all_queues(upper);
                }
        }
-       rtnl_unlock();
+       rcu_read_unlock();
 
        /* update the default user priority for VFs */
        ixgbe_update_default_up(adapter);
-- 
1.7.9.5


------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity 
planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit 
http://communities.intel.com/community/wired

Reply via email to