diff options
| author | Mark Lord <kernel@teksavvy.com> | 2010-09-04 14:17:59 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-07 13:57:23 -0700 |
| commit | 32737e934a952c1b0c744f2a78d80089d15c7ee3 (patch) | |
| tree | ca6b640910315f78fce923b9a2d601e7dd512f31 /drivers/net | |
| parent | cf9b94f88bdbe8a02015fc30d7c232b2d262d4ad (diff) | |
| download | linux-stable-32737e934a952c1b0c744f2a78d80089d15c7ee3.tar.gz linux-stable-32737e934a952c1b0c744f2a78d80089d15c7ee3.tar.bz2 linux-stable-32737e934a952c1b0c744f2a78d80089d15c7ee3.zip | |
PATCH: b44 Handle RX FIFO overflow better (simplified)
This patch is a simplified version of the original patch from James Courtier-Dutton.
>From: James Courtier-Dutton
>Subject: [PATCH] Fix b44 RX FIFO overflow recovery.
>Date: Wednesday, June 30, 2010 - 1:11 pm
>
>This patch improves the recovery after a RX FIFO overflow on the b44
>Ethernet NIC.
>Before it would do a complete chip reset, resulting is loss of link
>for a few seconds.
>This patch improves this to do recovery in about 20ms without loss of link.
>
>Signed off by: James@superbug.co.uk
Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/b44.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 37617abc1647..1e620e287ae0 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -848,6 +848,15 @@ static int b44_poll(struct napi_struct *napi, int budget) b44_tx(bp); /* spin_unlock(&bp->tx_lock); */ } + if (bp->istat & ISTAT_RFO) { /* fast recovery, in ~20msec */ + bp->istat &= ~ISTAT_RFO; + b44_disable_ints(bp); + ssb_device_enable(bp->sdev, 0); /* resets ISTAT_RFO */ + b44_init_rings(bp); + b44_init_hw(bp, B44_FULL_RESET_SKIP_PHY); + netif_wake_queue(bp->dev); + } + spin_unlock_irqrestore(&bp->lock, flags); work_done = 0; |