From patchwork Tue Jun 30 21:44:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 29321 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 426F1B70AA for ; Wed, 1 Jul 2009 10:12:22 +1000 (EST) Received: by ozlabs.org (Postfix) id 54A7DDE061; Wed, 1 Jul 2009 07:45:03 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id DDC4CDE060 for ; Wed, 1 Jul 2009 07:45:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753849AbZF3Vox (ORCPT ); Tue, 30 Jun 2009 17:44:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753704AbZF3Vow (ORCPT ); Tue, 30 Jun 2009 17:44:52 -0400 Received: from qmta03.emeryville.ca.mail.comcast.net ([76.96.30.32]:51671 "EHLO QMTA03.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753193AbZF3Vow (ORCPT ); Tue, 30 Jun 2009 17:44:52 -0400 Received: from OMTA10.emeryville.ca.mail.comcast.net ([76.96.30.28]) by QMTA03.emeryville.ca.mail.comcast.net with comcast id AK1q1c0020cQ2SLA3Mkw7J; Tue, 30 Jun 2009 21:44:56 +0000 Received: from localhost.localdomain ([63.64.152.142]) by OMTA10.emeryville.ca.mail.comcast.net with comcast id AMke1c00134bfcX8WMkgzg; Tue, 30 Jun 2009 21:44:54 +0000 From: Jeff Kirsher Subject: [net-2.6 PATCH 3/4] ixgbe: Fix link capabilities during adapter resets To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, stable@kernel.org, Mallikarjuna R Chilakala , Jeff Kirsher Date: Tue, 30 Jun 2009 14:44:36 -0700 Message-ID: <20090630214436.17464.65010.stgit@localhost.localdomain> In-Reply-To: <20090630214349.17464.25370.stgit@localhost.localdomain> References: <20090630214349.17464.25370.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mallikarjuna R Chilakala Adapter link advertisement capabilities were not persistent during adapter resets. While configuring multispeed fiber link check for phy autoneg_advertised settings before overwriting with default link capabilities Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher --- drivers/net/ixgbe/ixgbe_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 30d8c0e..fce2ef4 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -4506,7 +4506,8 @@ static void ixgbe_multispeed_fiber_task(struct work_struct *work) u32 autoneg; adapter->flags |= IXGBE_FLAG_IN_SFP_LINK_TASK; - if (hw->mac.ops.get_link_capabilities) + autoneg = hw->phy.autoneg_advertised; + if ((!autoneg) && (hw->mac.ops.get_link_capabilities)) hw->mac.ops.get_link_capabilities(hw, &autoneg, &hw->mac.autoneg); if (hw->mac.ops.setup_link_speed)