aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2010-03-25 17:15:06 +0000
committerDavid S. Miller <davem@davemloft.net>2010-03-27 08:33:20 -0700
commite017b60316468f21a63bdd4affefaf81a7f988fd (patch)
treeedcfc9bcbcd3e45dd35b4b58d1e1a7fdbfe0ec22 /drivers/net/igb
parentc0e4d4bad4e8cf0aa787a3045392f949d76b5886 (diff)
downloadkernel_samsung_smdk4412-e017b60316468f21a63bdd4affefaf81a7f988fd.zip
kernel_samsung_smdk4412-e017b60316468f21a63bdd4affefaf81a7f988fd.tar.gz
kernel_samsung_smdk4412-e017b60316468f21a63bdd4affefaf81a7f988fd.tar.bz2
igb: use correct bits to identify if managability is enabled
igb was previously checking the wrong bits in the MANC register to determine if managability was enabled. As a result it was incorrectly powering down and resetting the phy when it didn't need to. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb')
-rw-r--r--drivers/net/igb/e1000_mac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/igb/e1000_mac.c
index 2a8a886..be8d010 100644
--- a/drivers/net/igb/e1000_mac.c
+++ b/drivers/net/igb/e1000_mac.c
@@ -1367,7 +1367,8 @@ out:
* igb_enable_mng_pass_thru - Enable processing of ARP's
* @hw: pointer to the HW structure
*
- * Verifies the hardware needs to allow ARPs to be processed by the host.
+ * Verifies the hardware needs to leave interface enabled so that frames can
+ * be directed to and from the management interface.
**/
bool igb_enable_mng_pass_thru(struct e1000_hw *hw)
{
@@ -1380,8 +1381,7 @@ bool igb_enable_mng_pass_thru(struct e1000_hw *hw)
manc = rd32(E1000_MANC);
- if (!(manc & E1000_MANC_RCV_TCO_EN) ||
- !(manc & E1000_MANC_EN_MAC_ADDR_FILTER))
+ if (!(manc & E1000_MANC_RCV_TCO_EN))
goto out;
if (hw->mac.arc_subsystem_valid) {