From patchwork Mon Nov 29 15:51:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Stezenbach X-Patchwork-Id: 364452 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 oATFptM0017512 for ; Mon, 29 Nov 2010 15:51:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754632Ab0K2Pvg (ORCPT ); Mon, 29 Nov 2010 10:51:36 -0500 Received: from bar.sig21.net ([80.81.252.164]:50589 "EHLO bar.sig21.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752107Ab0K2Pve (ORCPT ); Mon, 29 Nov 2010 10:51:34 -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 ) id 1PN60o-00025Q-Tk; Mon, 29 Nov 2010 16:51:32 +0100 Received: from js by zzz.local with local (Exim 4.72) (envelope-from ) id 1PN60k-0008SM-Hc; Mon, 29 Nov 2010 16:51:26 +0100 Date: Mon, 29 Nov 2010 16:51:26 +0100 From: Johannes Stezenbach To: Johannes Berg Cc: linux-wireless@vger.kernel.org, Ivo van Doorn , Gertjan van Wingerde , "John W. Linville" Subject: [PATCH v2 RFC] mac80211: fix "NOHZ: local_softirq_pending 08" Message-ID: <20101129155126.GA32482@sig21.net> References: <20101129145439.GA31910@sig21.net> <1291043349.3532.4.camel@jlt3.sipsolutions.net> <20101129152735.GA32319@sig21.net> <1291045056.3532.5.camel@jlt3.sipsolutions.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1291045056.3532.5.camel@jlt3.sipsolutions.net> 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.621, BAYES_00=-2.599 autolearn=no Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: 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 15:51:56 +0000 (UTC) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index eaa4aff..df42312 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -2055,8 +2055,8 @@ static inline void ieee80211_rx_ni(struct ieee80211_hw *hw, * * This function may not be called in IRQ context. Calls to this function * for a single hardware must be synchronized against each other. Calls - * to this function and ieee80211_tx_status_irqsafe() may not be mixed - * for a single hardware. + * to this function, ieee80211_tx_status_ni() and ieee80211_tx_status_irqsafe() + * may not be mixed for a single hardware. * * @hw: the hardware the frame was transmitted by * @skb: the frame that was transmitted, owned by mac80211 after this call @@ -2065,13 +2065,28 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb); /** + * ieee80211_tx_status_ni - transmit status callback (in process context) + * + * Like ieee80211_tx_status() but can be called in process context. + * + * Calls to this function, ieee80211_tx_status() and + * ieee80211_tx_status_irqsafe() may not be mixed + * for a single hardware. + * + * @hw: the hardware the frame was transmitted by + * @skb: the frame that was transmitted, owned by mac80211 after this call + */ +void ieee80211_tx_status_ni(struct ieee80211_hw *hw, + struct sk_buff *skb); + +/** * ieee80211_tx_status_irqsafe - IRQ-safe transmit status callback * * Like ieee80211_tx_status() but can be called in IRQ context * (internally defers to a tasklet.) * - * Calls to this function and ieee80211_tx_status() may not be mixed for a - * single hardware. + * Calls to this function, ieee80211_tx_status() and + * ieee80211_tx_status_ni() may not be mixed for a single hardware. * * @hw: the hardware the frame was transmitted by * @skb: the frame that was transmitted, owned by mac80211 after this call diff --git a/net/mac80211/status.c b/net/mac80211/status.c index bed7e32..ce4d239 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -170,7 +170,8 @@ static void ieee80211_frame_acked(struct sta_info *sta, struct sk_buff *skb) */ #define STA_LOST_PKT_THRESHOLD 50 -void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) +void __ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, + int (*netif_rx_func)(struct sk_buff *skb)) { struct sk_buff *skb2; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; @@ -403,7 +404,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_func(skb2); } } @@ -412,10 +413,22 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) } if (prev_dev) { skb->dev = prev_dev; - netif_rx(skb); + netif_rx_func(skb); skb = NULL; } rcu_read_unlock(); dev_kfree_skb(skb); } + +void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) +{ + __ieee80211_tx_status(hw, skb, netif_rx); +} EXPORT_SYMBOL(ieee80211_tx_status); + +void ieee80211_tx_status_ni(struct ieee80211_hw *hw, + struct sk_buff *skb) +{ + __ieee80211_tx_status(hw, skb, netif_rx_ni); +} +EXPORT_SYMBOL(ieee80211_tx_status_ni);