From patchwork Fri Jul 23 05:17:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith X-Patchwork-Id: 113831 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6N5E0Xn023949 for ; Fri, 23 Jul 2010 05:14:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752671Ab0GWFN7 (ORCPT ); Fri, 23 Jul 2010 01:13:59 -0400 Received: from mail.atheros.com ([12.36.123.2]:22509 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752238Ab0GWFN6 (ORCPT ); Fri, 23 Jul 2010 01:13:58 -0400 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Thu, 22 Jul 2010 22:13:58 -0700 Received: from CHEXHC-01.global.atheros.com (10.12.0.100) by SC1EXHC-01.global.atheros.com (10.10.20.105) with Microsoft SMTP Server (TLS) id 8.2.213.0; Thu, 22 Jul 2010 22:13:58 -0700 Received: from kamboji (10.12.0.31) by CHEXHC-01.global.atheros.com (10.12.0.100) with Microsoft SMTP Server (TLS) id 8.2.176.0; Fri, 23 Jul 2010 10:43:55 +0530 From: Sujith MIME-Version: 1.0 Message-ID: <19529.9687.183293.284789@gargle.gargle.HOWL> Date: Fri, 23 Jul 2010 10:47:11 +0530 To: CC: , Subject: [PATCH] mac80211: Don't set per-BSS QoS for monitor interfaces 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 (demeter.kernel.org [140.211.167.41]); Fri, 23 Jul 2010 05:14:00 +0000 (UTC) diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 7947921..748387d 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -803,8 +803,12 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata) /* after reinitialize QoS TX queues setting to default, * disable QoS at all */ - sdata->vif.bss_conf.qos = sdata->vif.type != NL80211_IFTYPE_STATION; - ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS); + + if (sdata->vif.type != NL80211_IFTYPE_MONITOR) { + sdata->vif.bss_conf.qos = + sdata->vif.type != NL80211_IFTYPE_STATION; + ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_QOS); + } } void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,