From patchwork Sun Oct 11 10:19:21 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Johannes Berg <johannes@sipsolutions.net>
X-Patchwork-Id: 52997
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 n9BAOpTA029060
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Sun, 11 Oct 2009 10:24:52 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755706AbZJKKUH (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Sun, 11 Oct 2009 06:20:07 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756091AbZJKKUG
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Sun, 11 Oct 2009 06:20:06 -0400
Received: from xc.sipsolutions.net ([83.246.72.84]:56273 "EHLO
	sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755587AbZJKKUF (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Sun, 11 Oct 2009 06:20:05 -0400
Received: by sipsolutions.net with esmtpsa
	(TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69)
	(envelope-from <johannes@sipsolutions.net>)
	id 1MwvWN-0005qb-5N; Sun, 11 Oct 2009 12:19:23 +0200
Subject: [PATCH] b43: fix ieee80211_rx() context
From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: David Miller <davem@davemloft.net>, Kalle Valo <kalle.valo@iki.fi>,
	Dave Young <hidave.darkstar@gmail.com>,
	linux-wireless <linux-wireless@vger.kernel.org>
Date: Sun, 11 Oct 2009 12:19:21 +0200
Message-Id: <1255256361.4095.56.camel@johannes.local>
Mime-Version: 1.0
X-Mailer: Evolution 2.28.0 
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


--- wireless-testing.orig/drivers/net/wireless/b43/xmit.c	2009-10-11 12:11:50.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43/xmit.c	2009-10-11 12:12:06.000000000 +0200
@@ -690,7 +690,10 @@ void b43_rx(struct b43_wldev *dev, struc
 	}
 
 	memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
+
+	local_bh_disable();
 	ieee80211_rx(dev->wl->hw, skb);
+	local_bh_enable();
 
 #if B43_DEBUG
 	dev->rx_count++;