From e4c6bd009c4d90f7f6c39eab9c12baab4316c5b5 Mon Sep 17 00:00:00 2001
From: Mark Lord <kernel@teksavvy.com>
Date: Sat, 4 Sep 2010 14:17:59 +0000
Subject: [PATCH] --- yaml --- r: 210579 b: refs/heads/master c:
 32737e934a952c1b0c744f2a78d80089d15c7ee3 h: refs/heads/master i:   210577:
 80cf17fdf211dbf86833d21c451c9298a3fbc1a3   210575:
 579cad92ccb94cd113013b2f35d99b4c334ae2e2 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/b44.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 63670286556b..96a24f9d7ad5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf9b94f88bdbe8a02015fc30d7c232b2d262d4ad
+refs/heads/master: 32737e934a952c1b0c744f2a78d80089d15c7ee3
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
index 37617abc1647..1e620e287ae0 100644
--- a/trunk/drivers/net/b44.c
+++ b/trunk/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;