From 76cd9473fdafcd9af6827312b1d265202a41d14b Mon Sep 17 00:00:00 2001
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Date: Mon, 25 Oct 2010 11:24:29 +0200
Subject: [PATCH] --- yaml --- r: 224262 b: refs/heads/master c:
 fb2382c75b1292aff0ebc8e209b0cb9ba70bb2cf h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/wireless/wl12xx/wl1271_rx.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4b4ab43ae5a2..cac3cb0c6c4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff6d76fd3d45ed5494287e57d76073739721214b
+refs/heads/master: fb2382c75b1292aff0ebc8e209b0cb9ba70bb2cf
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c b/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c
index 35448e7c0dd5..cacfee56a0d0 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c
@@ -184,10 +184,14 @@ void wl1271_rx(struct wl1271 *wl, struct wl1271_fw_status *status)
 		while (pkt_offset < buf_size) {
 			pkt_length = wl1271_rx_get_buf_size(status,
 					drv_rx_counter);
-			if (wl1271_rx_handle_data(wl,
-					wl->aggr_buf + pkt_offset,
-					pkt_length) < 0)
-				break;
+			/*
+			 * the handle data call can only fail in memory-outage
+			 * conditions, in that case the received frame will just
+			 * be dropped.
+			 */
+			wl1271_rx_handle_data(wl,
+					      wl->aggr_buf + pkt_offset,
+					      pkt_length);
 			wl->rx_counter++;
 			drv_rx_counter++;
 			drv_rx_counter &= NUM_RX_PKT_DESC_MOD_MASK;