From 6c6f5a9de6756aafeb3a8b17f2cf83d68537aa2a Mon Sep 17 00:00:00 2001
From: Hante Meuleman <meuleman@broadcom.com>
Date: Wed, 2 Jan 2013 15:22:38 +0100
Subject: [PATCH] --- yaml --- r: 351807 b: refs/heads/master c:
 0429a6fa6be9489bf451e9fcc0f97341e4a356b6 h: refs/heads/master i:   351805:
 d846300e6a3b962cee5374dec61a9b4d448158a6   351803:
 47d2ed0e56a154246150cd6872b3ae5a369b1041   351799:
 b72ec0b1dfb3f634f223e84a4d4beb8cb96cf719   351791:
 afe3d4861caf591f961264fcdbc2913096bd13e6   351775:
 ccd99005244743d1b079e053377c0a6b7bef07c8   351743:
 b06b4f0dccb748980b8323472394f4a899ec3825 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e55d38322a8f..f5219dc27eb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 637ccc27f46f2232267e689b6f8eb744f78f4810
+refs/heads/master: 0429a6fa6be9489bf451e9fcc0f97341e4a356b6
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 914c56fe6c5f..22eae57d9546 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -467,7 +467,11 @@ static void brcmf_usb_rx_complete(struct urb *urb)
 			devinfo->bus_pub.bus->dstats.rx_errors++;
 		} else
 			brcmf_rx_packet(devinfo->dev, ifidx, skb);
-		brcmf_usb_rx_refill(devinfo, req);
+		/* zero lenght packets indicate usb "failure". Do not refill */
+		if (urb->actual_length)
+			brcmf_usb_rx_refill(devinfo, req);
+		else
+			brcmf_usb_enq(devinfo, &devinfo->rx_freeq, req, NULL);
 	} else {
 		brcmu_pkt_buf_free_skb(skb);
 		brcmf_usb_enq(devinfo, &devinfo->rx_freeq, req, NULL);