From patchwork Sun Jun 5 09:14:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 630371 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rMsr71382z9t6C for ; Sun, 5 Jun 2016 19:25:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751458AbcFEJZZ (ORCPT ); Sun, 5 Jun 2016 05:25:25 -0400 Received: from [111.193.70.236] ([111.193.70.236]:56867 "EHLO mail.zhuyj.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750911AbcFEJZX (ORCPT ); Sun, 5 Jun 2016 05:25:23 -0400 Received: from mail.zhuyj.com (mail.zhuyj.com [192.168.2.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.zhuyj.com (Postfix) with ESMTPSA id 7B1A65C3E22; Sun, 5 Jun 2016 17:14:53 +0800 (CST) From: zyjzyj2000@gmail.com To: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org Cc: Zhu Yanjun Subject: [PATCH 1/1] ixgbe: replace rtnl_lock with rcu_read_lock Date: Sun, 5 Jun 2016 17:14:51 +0800 Message-Id: <1465118091-6233-2-git-send-email-zyjzyj2000@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1465118091-6233-1-git-send-email-zyjzyj2000@gmail.com> References: <1465118091-6233-1-git-send-email-zyjzyj2000@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zhu Yanjun Signed-off-by: Zhu Yanjun --- 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);