Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256503
b: refs/heads/master
c: 9505ee3
h: refs/heads/master
i:
  256501: f18ea40
  256499: 6c8bf04
  256495: ab526d2
v: v3
  • Loading branch information
Vladislav Zolotarov authored and David S. Miller committed Jul 19, 2011
1 parent 93fc5a9 commit 4074acd
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: c636322b24eb69b7c1ccdc070164de51cee3f37c
refs/heads/master: 9505ee376739c26cf1d7d4e551d2f63b9d7e5729
6 changes: 3 additions & 3 deletions trunk/drivers/net/bnx2x/bnx2x_cmn.c
Original file line number Diff line number Diff line change
Expand Up @@ -1989,6 +1989,9 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
return -EINVAL;
}

/* Stop Tx */
bnx2x_tx_disable(bp);

#ifdef BCM_CNIC
bnx2x_cnic_notify(bp, CNIC_CTL_STOP_CMD);
#endif
Expand All @@ -1997,9 +2000,6 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)

bp->rx_mode = BNX2X_RX_MODE_NONE;

/* Stop Tx */
bnx2x_tx_disable(bp);

del_timer_sync(&bp->timer);

/* Set ALWAYS_ALIVE bit in shmem */
Expand Down

0 comments on commit 4074acd

Please sign in to comment.