From patchwork Thu Nov 26 15:09:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 63188 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAQF9rO0018440 for ; Thu, 26 Nov 2009 15:09:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760654AbZKZPJo (ORCPT ); Thu, 26 Nov 2009 10:09:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760651AbZKZPJo (ORCPT ); Thu, 26 Nov 2009 10:09:44 -0500 Received: from smtp.nokia.com ([192.100.105.134]:27819 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760650AbZKZPJn (ORCPT ); Thu, 26 Nov 2009 10:09:43 -0500 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx09.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id nAQF9XBh027661; Thu, 26 Nov 2009 09:09:41 -0600 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 26 Nov 2009 17:09:16 +0200 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 26 Nov 2009 17:09:15 +0200 Received: from [127.0.1.1] (essapo-nirac252122.europe.nokia.com [10.162.252.122]) by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id nAQF9CdS020363; Thu, 26 Nov 2009 17:09:13 +0200 Subject: [PATCH 07/12] wl1251: use __dev_alloc_skb() on RX To: linville@tuxdriver.com From: Kalle Valo Cc: linux-wireless@vger.kernel.org Date: Thu, 26 Nov 2009 17:09:11 +0200 Message-ID: <20091126150911.917.96496.stgit@tikku> In-Reply-To: <20091126150141.917.35278.stgit@tikku> References: <20091126150141.917.35278.stgit@tikku> User-Agent: StGit/0.15 MIME-Version: 1.0 X-OriginalArrivalTime: 26 Nov 2009 15:09:15.0732 (UTC) FILETIME=[6B4F1140:01CA6EAA] X-Nokia-AV: Clean Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/wl12xx/wl1251_rx.c b/drivers/net/wireless/wl12xx/wl1251_rx.c index 04f3dcd..5731dd7 100644 --- a/drivers/net/wireless/wl12xx/wl1251_rx.c +++ b/drivers/net/wireless/wl12xx/wl1251_rx.c @@ -131,7 +131,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 + WL1251_RX_ALIGNMENT); + skb = __dev_alloc_skb(length + WL1251_RX_ALIGNMENT, GFP_KERNEL); if (!skb) { wl1251_error("Couldn't allocate RX frame"); return;