Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195051
b: refs/heads/master
c: 757c530
h: refs/heads/master
i:
  195049: 7338902
  195047: bf014c2
v: v3
  • Loading branch information
Bruce Allan authored and David S. Miller committed May 13, 2010
1 parent 38282e5 commit 696d7f8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9c5e209d4ba00eb09922f0f56136474372395c2b
refs/heads/master: 757c530407a92fd460d557af59ba86920cf025cb
8 changes: 4 additions & 4 deletions trunk/drivers/net/e1000e/lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
* 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)
{
Expand All @@ -2528,8 +2529,7 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw)

manc = er32(MANC);

if (!(manc & E1000_MANC_RCV_TCO_EN) ||
!(manc & E1000_MANC_EN_MAC_ADDR_FILTER))
if (!(manc & E1000_MANC_RCV_TCO_EN))
return ret_val;

if (hw->mac.arc_subsystem_valid) {
Expand Down

0 comments on commit 696d7f8

Please sign in to comment.