diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-27 20:40:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-27 20:40:18 -0500 |
| commit | cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419 (patch) | |
| tree | 5f0e86afb61b33658ec42b37ae739809ec98cb3d /net | |
| parent | 9018e93948c6f8f95fbcc9fa05f6c403d6adb406 (diff) | |
| parent | b49ba04a3a0382e7314d990707c21094c410425a (diff) | |
| download | linux-stable-cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419.tar.gz linux-stable-cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419.tar.bz2 linux-stable-cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/ibss.c | 1 | ||||
| -rw-r--r-- | net/mac80211/iface.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index b3d76b756cd5..a4643969a13b 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)) diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index e47768cb8cb3..01a21c2f6ab3 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1314,6 +1314,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local) continue; } /* count everything else */ + sdata->vif.bss_conf.idle = false; count++; } |