---

yaml --- r: 210579 b: refs/heads/master c: 32737e9 h: refs/heads/master i: 210577: 80cf17f 210575: 579cad9 v: v3
git-mirror · Sep 7, 2010 · e4c6bd0 · e4c6bd0
1 parent 0fb7fdf
commit e4c6bd0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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;