From c1cd2684c39a6449204fde98d21620e918f680bd Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Thu, 10 May 2012 12:13:22 +0300
Subject: [PATCH] --- yaml --- r: 314063 b: refs/heads/master c:
 7cfefd1f2acbd5ff2a1a8846de058064bd63550a h: refs/heads/master i:   314061:
 d8966afe3bfba27d0e1d8b2d911c88614fdc338e   314059:
 4ed09d79c0ea8c0f20e086934e709b9ad68a600c   314055:
 2223f474e9d2191ea327e18b9f14b615ae18c2bc   314047:
 84e2dcbc138b4f811f5014e0c57c82b5e016883b v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ti/wl18xx/main.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 48c7c69118dc..9b3831615035 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fab39dc4a5fbd241787eb964d911d0aecbbcb84
+refs/heads/master: 7cfefd1f2acbd5ff2a1a8846de058064bd63550a
diff --git a/trunk/drivers/net/wireless/ti/wl18xx/main.c b/trunk/drivers/net/wireless/ti/wl18xx/main.c
index 4a5ef6e53954..a074d811fef0 100644
--- a/trunk/drivers/net/wireless/ti/wl18xx/main.c
+++ b/trunk/drivers/net/wireless/ti/wl18xx/main.c
@@ -243,7 +243,8 @@ static int wl18xx_identify_chip(struct wl1271 *wl)
 		wl1271_debug(DEBUG_BOOT, "chip id 0x%x (185x PG10)",
 			     wl->chip.id);
 		wl->sr_fw_name = WL18XX_FW_NAME;
-		wl->quirks |= WLCORE_QUIRK_NO_ELP;
+		wl->quirks |= WLCORE_QUIRK_NO_ELP |
+			      WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN;
 
 		/* TODO: need to blocksize alignment for RX/TX separately? */
 		break;