From 39cd1c609e78d7ab322a94ed7bff1e68816f298a Mon Sep 17 00:00:00 2001
From: Kalle Valo <kalle.valo@nokia.com>
Date: Mon, 30 Nov 2009 10:18:12 +0200
Subject: [PATCH] --- yaml --- r: 183262 b: refs/heads/master c:
 cdd1e9a91ea55594cbcc9847dbb9392e341cbefd h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fc7ea25a6703..b4803135ba00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fa6282a1775bd41508220e65ba0cb92235b67d4
+refs/heads/master: cdd1e9a91ea55594cbcc9847dbb9392e341cbefd
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_rx.c b/trunk/drivers/net/wireless/wl12xx/wl1251_rx.c
index f84cc89cbffc..b56732226cc0 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1251_rx.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1251_rx.c
@@ -126,7 +126,7 @@ static void wl1251_rx_body(struct wl1251 *wl,
 	if (wl->rx_current_buffer)
 		rx_packet_ring_addr += wl->data_path->rx_packet_ring_chunk_size;
 
-	skb = dev_alloc_skb(length);
+	skb = __dev_alloc_skb(length, GFP_KERNEL);
 	if (!skb) {
 		wl1251_error("Couldn't allocate RX frame");
 		return;