From patchwork Fri Jul 24 04:08:16 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: 30164 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 0B2ECB7079 for ; Fri, 24 Jul 2009 14:08:41 +1000 (EST) Received: by ozlabs.org (Postfix) id F01E1DDD0B; Fri, 24 Jul 2009 14:08:40 +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 7832EDDD01 for ; Fri, 24 Jul 2009 14:08:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751515AbZGXEIe (ORCPT ); Fri, 24 Jul 2009 00:08:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751410AbZGXEId (ORCPT ); Fri, 24 Jul 2009 00:08:33 -0400 Received: from qmta09.emeryville.ca.mail.comcast.net ([76.96.30.96]:46608 "EHLO QMTA09.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751364AbZGXEId (ORCPT ); Fri, 24 Jul 2009 00:08:33 -0400 Received: from OMTA13.emeryville.ca.mail.comcast.net ([76.96.30.52]) by QMTA09.emeryville.ca.mail.comcast.net with comcast id KcmR1c00417UAYkA9g8aWr; Fri, 24 Jul 2009 04:08:34 +0000 Received: from localhost.localdomain ([63.64.152.142]) by OMTA13.emeryville.ca.mail.comcast.net with comcast id Kg8J1c00234bfcX8Zg8LDA; Fri, 24 Jul 2009 04:08:32 +0000 From: Jeff Kirsher Subject: [net-next-2.6 PATCH 04/13] igb: do not overwrite EEPROM LED settings To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Alexander Duyck , Jeff Kirsher Date: Thu, 23 Jul 2009 21:08:16 -0700 Message-ID: <20090724040816.30709.39700.stgit@localhost.localdomain> In-Reply-To: <20090724040700.30709.31473.stgit@localhost.localdomain> References: <20090724040700.30709.31473.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 The igb driver was overwritting the LED settings that were configured via EEPROM. This is not correct behavior as the LED settings are meant to be configured by EEPROM and not changed. This change removes the code that was setting the LED behavior on the interface. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher --- drivers/net/igb/e1000_82575.c | 7 +------ 1 files changed, 1 insertions(+), 6 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 f946bed..606c25c 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c @@ -1000,7 +1000,7 @@ static s32 igb_init_hw_82575(struct e1000_hw *hw) **/ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) { - u32 ctrl, led_ctrl; + u32 ctrl; s32 ret_val; bool link; @@ -1015,11 +1015,6 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) break; case e1000_phy_igp_3: ret_val = igb_copper_link_setup_igp(hw); - /* Setup activity LED */ - led_ctrl = rd32(E1000_LEDCTL); - led_ctrl &= IGP_ACTIVITY_LED_MASK; - led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE); - wr32(E1000_LEDCTL, led_ctrl); break; default: ret_val = -E1000_ERR_PHY;