From patchwork Mon Nov 29 14:54:39 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Johannes Stezenbach <js@sig21.net>
X-Patchwork-Id: 364242
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oATEsn8h029389
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Mon, 29 Nov 2010 14:54:49 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751651Ab0K2Oys (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Mon, 29 Nov 2010 09:54:48 -0500
Received: from bar.sig21.net ([80.81.252.164]:39739 "EHLO bar.sig21.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750959Ab0K2Oyr (ORCPT <rfc822; linux-wireless@vger.kernel.org>);
	Mon, 29 Nov 2010 09:54:47 -0500
Received: from p5099b351.dip0.t-ipconnect.de ([80.153.179.81] helo=zzz.local)
	by bar.sig21.net with esmtpsa (TLS-1.0:RSA_ARCFOUR_SHA1:16)
	(Exim 4.63) (envelope-from <js@sig21.net>)
	id 1PN57s-0001hz-BU; Mon, 29 Nov 2010 15:54:45 +0100
Received: from js by zzz.local with local (Exim 4.72)
	(envelope-from <js@sig21.net>)
	id 1PN57n-0008Kk-AC; Mon, 29 Nov 2010 15:54:39 +0100
Date: Mon, 29 Nov 2010 15:54:39 +0100
From: Johannes Stezenbach <js@sig21.net>
To: linux-wireless@vger.kernel.org
Cc: Ivo van Doorn <IvDoorn@gmail.com>,
	Gertjan van Wingerde <gwingerde@gmail.com>,
	"John W. Linville" <linville@tuxdriver.com>,
	Johannes Berg <johannes@sipsolutions.net>
Subject: [PATCH RFC] mac80211: fix "NOHZ: local_softirq_pending 08"
Message-ID: <20101129145439.GA31910@sig21.net>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
X-Spam-21-Score: -3.8 (---)
X-Spam-21-Report: No, score=-3.8 required=5.0 tests=ALL_TRUSTED=-1.8,
	AWL=0.625, BAYES_00=-2.599 autolearn=no
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Mon, 29 Nov 2010 14:54:50 +0000 (UTC)


diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index bed7e32..ba8dd8e 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -403,7 +403,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
 				skb2 = skb_clone(skb, GFP_ATOMIC);
 				if (skb2) {
 					skb2->dev = prev_dev;
-					netif_rx(skb2);
+					netif_rx_ni(skb2);
 				}
 			}
 
@@ -412,7 +412,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
 	}
 	if (prev_dev) {
 		skb->dev = prev_dev;
-		netif_rx(skb);
+		netif_rx_ni(skb);
 		skb = NULL;
 	}
 	rcu_read_unlock();