diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2012-02-22 12:35:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-23 01:57:17 -0500 |
| commit | c71013597d49c7ca8bb5049f0c7873df2643fad5 (patch) | |
| tree | 8dba220928e7b0cc4b917f608f87814ed0bacc88 | |
| parent | d13ba512cbba7de5d55d7a3b2aae7d83c8921457 (diff) | |
| download | op-kernel-dev-c71013597d49c7ca8bb5049f0c7873df2643fad5.zip op-kernel-dev-c71013597d49c7ca8bb5049f0c7873df2643fad5.tar.gz | |
tg3: Clear RECOVERY_PENDING with reset_task_cancel
If an error happens in the tx completion thread, tg3_reset_task will be
scheduled and TX_RECOVERY_PENDING will be set. The TX_RECOVERY_PENDING
flag causes tg3_poll[_msix] to return early before doing much of its
work. Tg3_reset_task() gets canceled when the configuration of the
device is changing, which always results in a chip reset. When this
happens, the TX_RECOVERY_PENDING flag may be left set, which would
unnecessarily hinder tg3_poll from doing work. This patch fixes the
problem.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index f921484..21b39c5 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -6163,6 +6163,7 @@ static inline void tg3_reset_task_cancel(struct tg3 *tp) { cancel_work_sync(&tp->reset_task); tg3_flag_clear(tp, RESET_TASK_PENDING); + tg3_flag_clear(tp, TX_RECOVERY_PENDING); } static int tg3_poll_msix(struct napi_struct *napi, int budget) @@ -15937,7 +15938,6 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev, /* Want to make sure that the reset task doesn't run */ tg3_reset_task_cancel(tp); - tg3_flag_clear(tp, TX_RECOVERY_PENDING); netif_device_detach(netdev); |
