diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-01 16:48:50 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-01 16:48:50 +0100 |
| commit | 874239f51f8759f3955630fa5da5cf13cd6567d5 (patch) | |
| tree | 224640a759c0734bc6d0bfd5fd207301b1ef4a10 /net/mac80211/ibss.c | |
| parent | rtlwifi: Convert to asynchronous firmware load (diff) | |
| parent | iwlwifi: fix PCI-E transport "inta" race (diff) | |
| download | linux-874239f51f8759f3955630fa5da5cf13cd6567d5.tar.xz linux-874239f51f8759f3955630fa5da5cf13cd6567d5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | 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 a98d370b56f6..7b3a0b0aa246 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -81,6 +81,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)) |