Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 189173
b: refs/heads/master
c: e017b60
h: refs/heads/master
i:
  189171: f601a80
v: v3
  • Loading branch information
Alexander Duyck authored and David S. Miller committed Mar 27, 2010
1 parent 6ccd73c commit 7e40346
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: c0e4d4bad4e8cf0aa787a3045392f949d76b5886
refs/heads/master: e017b60316468f21a63bdd4affefaf81a7f988fd
6 changes: 3 additions & 3 deletions trunk/drivers/net/igb/e1000_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,8 @@ s32 igb_write_8bit_ctrl_reg(struct e1000_hw *hw, u32 reg,
* 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)
{
Expand All @@ -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) {
Expand Down

0 comments on commit 7e40346

Please sign in to comment.