From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759823AbaGOWJO (ORCPT ); Tue, 15 Jul 2014 18:09:14 -0400 Received: from mail-ob0-f201.google.com ([209.85.214.201]:50950 "EHLO mail-ob0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752018AbaGOWJK (ORCPT ); Tue, 15 Jul 2014 18:09:10 -0400 From: David Decotigny To: Jeff Kirsher , Jesse Brandeburg , Bruce Allan , Carolyn Wyborny , Don Skidmore , Greg Rose , Alex Duyck , John Ronciak , Mitch Williams , Linux NICS , e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: David Decotigny Subject: [PATCH v1] e1000e: honor pause autoneg flag Date: Tue, 15 Jul 2014 15:09:06 -0700 Message-Id: <98ea4a6a8e42ffa454d5d42749262e8df02c0167.1405462125.git.decot@googlers.com> X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Before: ifup eth0 ethtool -A eth0 autoneg off rx on ethtool -a eth0 # rx on, as expected ifconfig eth0 up sleep 5 ethtool -a eth0 # rx off, not expected After: rx on with iface up, as expected Signed-off-by: David Decotigny --- drivers/net/ethernet/intel/e1000e/mac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c index 8c386f3a..ef014ae 100644 --- a/drivers/net/ethernet/intel/e1000e/mac.c +++ b/drivers/net/ethernet/intel/e1000e/mac.c @@ -1048,7 +1048,8 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw) * has completed, and if so, how the PHY and link partner has * flow control configured. */ - if ((hw->phy.media_type == e1000_media_type_copper) && mac->autoneg) { + if ((hw->phy.media_type == e1000_media_type_copper) && mac->autoneg && + hw->adapter->fc_autoneg) { /* Read the MII Status Register and check to see if AutoNeg * has completed. We read this twice because this reg has * some "sticky" (latched) bits. @@ -1191,7 +1192,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw) * flow control configured. */ if ((hw->phy.media_type == e1000_media_type_internal_serdes) && - mac->autoneg) { + mac->autoneg && hw->adapter->fc_autoneg) { /* Read the PCS_LSTS and check to see if AutoNeg * has completed. */ -- 2.0.0.526.g5318336