[PATCH] mac80211: update oper_channel on ibss join

[PATCH] mac80211: update oper_channel on ibss join

[Eliad Peller]

Commit 13c40c5 ("mac80211: Add HT operation modes for IBSS") broke
ibss operation by mistakenly removing the local->oper_channel
update (causing ibss to start on the wrong channel). fix it.

Signed-off-by: Eliad Peller <eliad@wizery.com>
---
 net/mac80211/ibss.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index f8a32bf..765072d 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -106,6 +106,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
 
 	sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
 
+	local->oper_channel = chan;
 	channel_type = ifibss->channel_type;
 	if (channel_type > NL80211_CHAN_HT20 &&
 	    !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
-- 
1.7.6.401.g6a319

Re: [PATCH] mac80211: update oper_channel on ibss join

[Simon Wunderlich]

[-- Attachment #1: Type: text/plain, Size: 1408 bytes --]

Hello Eliad,

this looks right, this line seems to be accidently removed - although
it also (accidently?) worked while I did my tests. :)

Anyway, thanks!

Acked-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>

On Tue, Jan 10, 2012 at 03:19:54PM +0200, Eliad Peller wrote:
> Commit 13c40c5 ("mac80211: Add HT operation modes for IBSS") broke
> ibss operation by mistakenly removing the local->oper_channel
> update (causing ibss to start on the wrong channel). fix it.
> 
> Signed-off-by: Eliad Peller <eliad@wizery.com>
> ---
>  net/mac80211/ibss.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
> index f8a32bf..765072d 100644
> --- a/net/mac80211/ibss.c
> +++ b/net/mac80211/ibss.c
> @@ -106,6 +106,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
>  
>  	sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
>  
> +	local->oper_channel = chan;
>  	channel_type = ifibss->channel_type;
>  	if (channel_type > NL80211_CHAN_HT20 &&
>  	    !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
> -- 
> 1.7.6.401.g6a319
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]