[PATCH] mac80211: Don't set per-BSS QoS for monitor interfaces

[PATCH] mac80211: Don't set per-BSS QoS for monitor interfaces

[Sujith]

In AP mode, there is no need to notify the driver about QoS
changes for the monitor interface that is created. The warning
in ieee80211_bss_info_change_notify() would be hit otherwise.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
---
 net/mac80211/util.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

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,
-- 
1.7.1.1

Re: [PATCH] mac80211: Don't set per-BSS QoS for monitor interfaces

[Johannes Berg]

On Fri, 2010-07-23 at 10:47 +0530, Sujith wrote:
> In AP mode, there is no need to notify the driver about QoS
> changes for the monitor interface that is created. The warning
> in ieee80211_bss_info_change_notify() would be hit otherwise.

Makes sense.

Acked-by: Johannes Berg <johannes@sipsolutions.net>

> Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
> ---
>  net/mac80211/util.c |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> 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,

Re: [PATCH] mac80211: Don't set per-BSS QoS for monitor interfaces

[Luis R. Rodriguez]

On Thu, Jul 22, 2010 at 11:01 PM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Fri, 2010-07-23 at 10:47 +0530, Sujith wrote:
>> In AP mode, there is no need to notify the driver about QoS
>> changes for the monitor interface that is created. The warning
>> in ieee80211_bss_info_change_notify() would be hit otherwise.
>
> Makes sense.
>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
>> Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>

Stable?

  Luis

Re: [PATCH] mac80211: Don't set per-BSS QoS for monitor interfaces

[Johannes Berg]

On Fri, 2010-07-23 at 10:29 -0700, Luis R. Rodriguez wrote:
> On Thu, Jul 22, 2010 at 11:01 PM, Johannes Berg
> <johannes@sipsolutions.net> wrote:
> > On Fri, 2010-07-23 at 10:47 +0530, Sujith wrote:
> >> In AP mode, there is no need to notify the driver about QoS
> >> changes for the monitor interface that is created. The warning
> >> in ieee80211_bss_info_change_notify() would be hit otherwise.
> >
> > Makes sense.
> >
> > Acked-by: Johannes Berg <johannes@sipsolutions.net>
> >> Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
> 
> Stable?

Err, no, the change that does this isn't going in until .36 I think.

johannes