From patchwork Thu Jan 14 22:20:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit PAPILLAULT X-Patchwork-Id: 72955 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0EMKkGq018150 for ; Thu, 14 Jan 2010 22:20:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932175Ab0ANWUp (ORCPT ); Thu, 14 Jan 2010 17:20:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932129Ab0ANWUp (ORCPT ); Thu, 14 Jan 2010 17:20:45 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:45751 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932111Ab0ANWUo (ORCPT ); Thu, 14 Jan 2010 17:20:44 -0500 Received: from smtp1-g21.free.fr (localhost [127.0.0.1]) by smtp1-g21.free.fr (Postfix) with ESMTP id 780B1940075; Thu, 14 Jan 2010 23:20:37 +0100 (CET) Received: from benoit-laptop (ns.popipo.fr [88.163.232.53]) by smtp1-g21.free.fr (Postfix) with ESMTP id 8D0AB9400B1; Thu, 14 Jan 2010 23:20:35 +0100 (CET) Received: by benoit-laptop (Postfix, from userid 1000) id 254701DE0DC; Thu, 14 Jan 2010 23:20:35 +0100 (CET) From: Benoit Papillault To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Benoit Papillault Subject: [PATCH] mac80211: Fixed netif_tx_wake_all_queues in IBSS mode Date: Thu, 14 Jan 2010 23:20:31 +0100 Message-Id: <1263507631-12933-1-git-send-email-benoit.papillault@free.fr> X-Mailer: git-send-email 1.6.3.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 1facfeb..c36b191 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c @@ -153,9 +153,11 @@ void ieee80211_offchannel_return(struct ieee80211_local *local, if (sdata->vif.type == NL80211_IFTYPE_STATION) { if (sdata->u.mgd.associated) ieee80211_offchannel_ps_disable(sdata); - netif_tx_wake_all_queues(sdata->dev); } + if (sdata->vif.type != NL80211_IFTYPE_MONITOR) + netif_tx_wake_all_queues(sdata->dev); + /* re-enable beaconing */ if (enable_beaconing && (sdata->vif.type == NL80211_IFTYPE_AP ||