UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Bruce Allan 2010-05-10 15:00:50 +00:00 committed by David S. Miller
parent 9c5e209d4b
commit 757c530407
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/e1000e/lib.c
View File

@ -2515,10 +2515,11 @@ s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length)
} }
/** /**
* e1000e_enable_mng_pass_thru - Enable processing of ARP's * e1000e_enable_mng_pass_thru - Check if management passthrough is needed
* @hw: pointer to the HW structure * @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 e1000e_enable_mng_pass_thru(struct e1000_hw *hw) bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
{ {
@ -2528,8 +2529,7 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)
manc = er32(MANC); manc = er32(MANC);
if (!(manc & E1000_MANC_RCV_TCO_EN) || if (!(manc & E1000_MANC_RCV_TCO_EN))
!(manc & E1000_MANC_EN_MAC_ADDR_FILTER))
return ret_val; return ret_val;
if (hw->mac.arc_subsystem_valid) { if (hw->mac.arc_subsystem_valid) {