Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362631
b: refs/heads/master
c: d46f7c4
h: refs/heads/master
i:
  362629: b18c34d
  362627: ab42be5
  362623: 1185774
v: v3
  • Loading branch information
Dmitry Kravkov authored and David S. Miller committed Apr 18, 2013
1 parent 8f00e1e commit d42571f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d5f2cffc49ae27aff52eeda6206acb5db54693c9
refs/heads/master: d46f7c4df342c27cea676939d7c005f1e86173e9
4 changes: 4 additions & 0 deletions trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -9878,6 +9878,10 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp)
REG_RD(bp, NIG_REG_NIG_INT_STS_CLR_0);
}
}
if (!CHIP_IS_E1x(bp))
/* block FW from writing to host */
REG_WR(bp, PGLUE_B_REG_INTERNAL_PFID_ENABLE_MASTER, 0);

/* wait until BRB is empty */
tmp_reg = REG_RD(bp, BRB1_REG_NUM_OF_FULL_BLOCKS);
while (timer_count) {
Expand Down

0 comments on commit d42571f

Please sign in to comment.