From patchwork Fri Mar 19 10:56:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 86913 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2JAwMLI008047 for ; Fri, 19 Mar 2010 10:58:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751500Ab0CSK6V (ORCPT ); Fri, 19 Mar 2010 06:58:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57900 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309Ab0CSK6V (ORCPT ); Fri, 19 Mar 2010 06:58:21 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2JAvuUp005180 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 19 Mar 2010 06:57:56 -0400 Received: from localhost (dhcp-0-117.brq.redhat.com [10.34.0.117]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2JAvtSw017244; Fri, 19 Mar 2010 06:57:56 -0400 Date: Fri, 19 Mar 2010 11:56:13 +0100 From: Stanislaw Gruszka To: Johannes Berg Cc: linux-wireless@vger.kernel.org, Reinette Chatre Subject: [RFC PATCH 1/2] mac80211: add interface for disabling QoS Message-ID: <20100319105612.GA4915@dhcp-lab-161.englab.brq.redhat.com> References: <20100309132113.GA2462@dhcp-lab-161.englab.brq.redhat.com> <20100310152024.GB2969@dhcp-lab-161.englab.brq.redhat.com> <1268265597.4192.3.camel@jlt3.sipsolutions.net> <20100311095656.GB4682@dhcp-lab-161.englab.brq.redhat.com> <1268319960.4413.1.camel@jlt3.sipsolutions.net> <20100316145114.GA2496@dhcp-lab-161.englab.brq.redhat.com> <1268774282.4054.1.camel@jlt3.sipsolutions.net> <20100317092612.GB3726@dhcp-lab-161.englab.brq.redhat.com> <1268841106.5989.1.camel@jlt3.sipsolutions.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1268841106.5989.1.camel@jlt3.sipsolutions.net> User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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, 19 Mar 2010 10:58:23 +0000 (UTC) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 45d7d44..11a192d 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -144,6 +144,7 @@ struct ieee80211_low_level_stats { * new beacon (beaconing modes) * @BSS_CHANGED_BEACON_ENABLED: Beaconing should be * enabled/disabled (beaconing modes) + * @BSS_CHANGED_QOS_DISABLED: QoS should be disabled */ enum ieee80211_bss_change { BSS_CHANGED_ASSOC = 1<<0, @@ -156,6 +157,7 @@ enum ieee80211_bss_change { BSS_CHANGED_BSSID = 1<<7, BSS_CHANGED_BEACON = 1<<8, BSS_CHANGED_BEACON_ENABLED = 1<<9, + BSS_CHANGED_QOS_DISABLED = 1<<10, }; /** diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index be5f723..64be5f4 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1130,7 +1130,7 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk, ieee80211_sta_wmm_params(local, ifmgd, elems.wmm_param, elems.wmm_param_len); else - ieee80211_set_wmm_default(sdata); + changed |= BSS_CHANGED_QOS_DISABLED; local->oper_channel = wk->chan;