Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 170710
b: refs/heads/master
c: 061bc70
h: refs/heads/master
v: v3
  • Loading branch information
Eilon Greenstein authored and David S. Miller committed Oct 15, 2009
1 parent 09e6a58 commit 1457e4d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 15 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: c4ff7cbf88be8bb0e3f942089f0ef0a40d98d654
refs/heads/master: 061bc702f6912b6e45b9aaf1c9bf2f8122406d47
19 changes: 5 additions & 14 deletions trunk/drivers/net/bnx2x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2565,21 +2565,12 @@ static void bnx2x_set_rx_mode(struct net_device *dev);
static void bnx2x_e1h_disable(struct bnx2x *bp)
{
int port = BP_PORT(bp);
int i;

bp->rx_mode = BNX2X_RX_MODE_NONE;
bnx2x_set_storm_rx_mode(bp);

netif_tx_disable(bp->dev);
bp->dev->trans_start = jiffies; /* prevent tx timeout */

REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0);

bnx2x_set_eth_mac_addr_e1h(bp, 0);

for (i = 0; i < MC_HASH_SIZE; i++)
REG_WR(bp, MC_HASH_OFFSET(bp, i), 0);

netif_carrier_off(bp->dev);
}

Expand All @@ -2589,13 +2580,13 @@ static void bnx2x_e1h_enable(struct bnx2x *bp)

REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 1);

bnx2x_set_eth_mac_addr_e1h(bp, 1);

/* Tx queue should be only reenabled */
netif_tx_wake_all_queues(bp->dev);

/* Initialize the receive filter. */
bnx2x_set_rx_mode(bp->dev);
/*
* Should not call netif_carrier_on since it will be called if the link
* is up when checking for link state
*/
}

static void bnx2x_update_min_max(struct bnx2x *bp)
Expand Down Expand Up @@ -10538,7 +10529,7 @@ static void bnx2x_self_test(struct net_device *dev,
/* disable input for TX port IF */
REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, 0);

link_up = bp->link_vars.link_up;
link_up = (bnx2x_link_test(bp) == 0);
bnx2x_nic_unload(bp, UNLOAD_NORMAL);
bnx2x_nic_load(bp, LOAD_DIAG);
/* wait until link state is restored */
Expand Down

0 comments on commit 1457e4d

Please sign in to comment.