From ffe181a2179a89a49a48bead4f55966873baeda8 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Mon, 2 Nov 2009 12:15:15 -0500
Subject: [PATCH] --- yaml --- r: 171413 b: refs/heads/master c:
 e9a6269d5bcb1c7cd18cea02a9a73fac8712f2d1 h: refs/heads/master i:   171411:
 c56e60f92533f34390ee9c6a21709bae08b419fa v: v3

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

diff --git a/[refs] b/[refs]
index 3c5c07f00e09..5e32eadbce79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c327d96759ac134384114830e19ded80e29fdcc4
+refs/heads/master: e9a6269d5bcb1c7cd18cea02a9a73fac8712f2d1
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c b/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c
index 37d81ab6acc0..ca645f38109b 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_rx.c
@@ -159,7 +159,7 @@ static void wl1271_rx_handle_data(struct wl1271 *wl, u32 length)
 	u8 *buf;
 	u8 beacon = 0;
 
-	skb = dev_alloc_skb(length);
+	skb = __dev_alloc_skb(length, GFP_KERNEL);
 	if (!skb) {
 		wl1271_error("Couldn't allocate RX frame");
 		return;