diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2010-05-10 11:00:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-13 02:31:11 -0400 |
commit | 757c530407a92fd460d557af59ba86920cf025cb (patch) | |
tree | b6b11d1f0dac4539fd050383d619eac29df9f58d /drivers/net/e1000e/lib.c | |
parent | 9c5e209d4ba00eb09922f0f56136474372395c2b (diff) |
e1000e: Remove EN_MAC_ADDR_FILTER check from enable_mng_pass_thru check
Patch addresses issues when manageability passthrough is enabled, but the
MAC_ADDR_FILTER bit is not set in the MANC register.
Signed-off-by: Bruce Allan <bruce.w.allan@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/e1000e/lib.c')
-rw-r--r-- | drivers/net/e1000e/lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index b0d2a60aa490..b32361dc340e 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/e1000e/lib.c | |||
@@ -2515,10 +2515,11 @@ s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length) | |||
2515 | } | 2515 | } |
2516 | 2516 | ||
2517 | /** | 2517 | /** |
2518 | * e1000e_enable_mng_pass_thru - Enable processing of ARP's | 2518 | * e1000e_enable_mng_pass_thru - Check if management passthrough is needed |
2519 | * @hw: pointer to the HW structure | 2519 | * @hw: pointer to the HW structure |
2520 | * | 2520 | * |
2521 | * Verifies the hardware needs to allow ARPs to be processed by the host. | 2521 | * Verifies the hardware needs to leave interface enabled so that frames can |
2522 | * be directed to and from the management interface. | ||
2522 | **/ | 2523 | **/ |
2523 | bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw) | 2524 | bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw) |
2524 | { | 2525 | { |
@@ -2528,8 +2529,7 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw) | |||
2528 | 2529 | ||
2529 | manc = er32(MANC); | 2530 | manc = er32(MANC); |
2530 | 2531 | ||
2531 | if (!(manc & E1000_MANC_RCV_TCO_EN) || | 2532 | if (!(manc & E1000_MANC_RCV_TCO_EN)) |
2532 | !(manc & E1000_MANC_EN_MAC_ADDR_FILTER)) | ||
2533 | return ret_val; | 2533 | return ret_val; |
2534 | 2534 | ||
2535 | if (hw->mac.arc_subsystem_valid) { | 2535 | if (hw->mac.arc_subsystem_valid) { |