Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 109125
b: refs/heads/master
c: 3cdf1db
h: refs/heads/master
i:
  109123: 70da6cd
v: v3
  • Loading branch information
Yitchak Gertner authored and David S. Miller committed Aug 25, 2008
1 parent c65679e commit ad0d29a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 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: 46230476b7c66f7cbc013b771873c797f7ba770b
refs/heads/master: 3cdf1db7db1649771d683b6ba323ff604ea3cc5e
22 changes: 11 additions & 11 deletions trunk/drivers/net/bnx2x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -4606,6 +4606,17 @@ static void bnx2x_init_internal_common(struct bnx2x *bp)
{
int i;

if (bp->flags & TPA_ENABLE_FLAG) {
struct tstorm_eth_tpa_exist tpa = {0};

tpa.tpa_exist = 1;

REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET,
((u32 *)&tpa)[0]);
REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET + 4,
((u32 *)&tpa)[1]);
}

/* Zero this manually as its initialization is
currently missing in the initTool */
for (i = 0; i < (USTORM_AGG_DATA_SIZE >> 2); i++)
Expand Down Expand Up @@ -5365,17 +5376,6 @@ static int bnx2x_init_common(struct bnx2x *bp)

enable_blocks_attention(bp);

if (bp->flags & TPA_ENABLE_FLAG) {
struct tstorm_eth_tpa_exist tmp = {0};

tmp.tpa_exist = 1;

REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET,
((u32 *)&tmp)[0]);
REG_WR(bp, BAR_TSTRORM_INTMEM + TSTORM_TPA_EXIST_OFFSET + 4,
((u32 *)&tmp)[1]);
}

if (!BP_NOMCP(bp)) {
bnx2x_acquire_phy_lock(bp);
bnx2x_common_init_phy(bp, bp->common.shmem_base);
Expand Down

0 comments on commit ad0d29a

Please sign in to comment.