diff options
| author | Ariel Elior | 2011-07-14 10:31:19 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-07-15 01:02:29 +0200 |
| commit | 7be08a7222c345798b0697a89ea3dd2c7c83f47c (patch) | |
| tree | ac88d5d5595ffd21fce1af25ecadc1e218f719b9 /drivers/net/bnx2x/bnx2x_cmn.c | |
| parent | Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | kernel-qcow2-linux-7be08a7222c345798b0697a89ea3dd2c7c83f47c.tar.gz kernel-qcow2-linux-7be08a7222c345798b0697a89ea3dd2c7c83f47c.tar.xz kernel-qcow2-linux-7be08a7222c345798b0697a89ea3dd2c7c83f47c.zip | |
bnx2x: Renaming the "reset_task" to "sp_rtnl_task"
Renaming the "reset_task" to a more general purpose name,
"sp_rtnl_task", as it is already used for another purpose
other than reset which is parity recovery, and since I
plan to add a third operation for this task, updating the
priority to traffic class and traffic class to transmission
queues mappings after dcbx negotiation takes place.
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_cmn.c')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_cmn.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c index bb7556016f41..8763625b09d0 100644 --- a/drivers/net/bnx2x/bnx2x_cmn.c +++ b/drivers/net/bnx2x/bnx2x_cmn.c @@ -3233,8 +3233,13 @@ void bnx2x_tx_timeout(struct net_device *dev) if (!bp->panic) bnx2x_panic(); #endif + + smp_mb__before_clear_bit(); + set_bit(BNX2X_SP_RTNL_TX_TIMEOUT, &bp->sp_rtnl_state); + smp_mb__after_clear_bit(); + /* This allows the netif to be shutdown gracefully before resetting */ - schedule_delayed_work(&bp->reset_task, 0); + schedule_delayed_work(&bp->sp_rtnl_task, 0); } int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state) |