From patchwork Wed Dec 23 23:20:47 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: 41703 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 D37A7B7BEB for ; Thu, 24 Dec 2009 10:21:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754932AbZLWXVI (ORCPT ); Wed, 23 Dec 2009 18:21:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752623AbZLWXVI (ORCPT ); Wed, 23 Dec 2009 18:21:08 -0500 Received: from qmta14.westchester.pa.mail.comcast.net ([76.96.59.212]:43239 "EHLO QMTA14.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752155AbZLWXVG (ORCPT ); Wed, 23 Dec 2009 18:21:06 -0500 Received: from OMTA24.westchester.pa.mail.comcast.net ([76.96.62.76]) by QMTA14.westchester.pa.mail.comcast.net with comcast id LiJU1d0061ei1Bg5EnM70L; Wed, 23 Dec 2009 23:21:07 +0000 Received: from localhost.localdomain ([63.64.152.142]) by OMTA24.westchester.pa.mail.comcast.net with comcast id LnMt1d00234bfcX3knMvUW; Wed, 23 Dec 2009 23:22:08 +0000 From: Jeff Kirsher Subject: [net-2.6 PATCH 1/4] igb: do not force pcs link when in KX mode To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Alexander Duyck , Jeff Kirsher Date: Wed, 23 Dec 2009 15:20:47 -0800 Message-ID: <20091223232047.16146.35264.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: Alexander Duyck We were forcing the PCS link up in error when we are in KX mode. We should only be disabling autoneg, not forcing the link up. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher --- drivers/net/igb/e1000_82575.c | 4 +--- 1 files changed, 1 insertions(+), 3 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/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index e8e9e91..c505b50 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c @@ -1096,9 +1096,7 @@ static s32 igb_setup_serdes_link_82575(struct e1000_hw *hw) hw_dbg("Configuring Autoneg:PCS_LCTL=0x%08X\n", reg); } else { /* Set PCS register for forced link */ - reg |= E1000_PCS_LCTL_FSD | /* Force Speed */ - E1000_PCS_LCTL_FORCE_LINK | /* Force Link */ - E1000_PCS_LCTL_FLV_LINK_UP; /* Force link value up */ + reg |= E1000_PCS_LCTL_FSD; /* Force Speed */ hw_dbg("Configuring Forced Link:PCS_LCTL=0x%08X\n", reg); }