diff options
| author |   Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de> | 2013-07-08 16:55:56 +0200 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2013-07-16 09:58:09 +0300 |
| commit | 7ca15a0ae865067aac8d36e27e0acbe4a8f1e70a (patch) | |
| tree | 0e1fb6ea9187626b3f9d2f806f26942e571d93c6 /net/mac80211/main.c | |
| parent | cfg80211/mac80211: use reduced txpower for 5 and 10 MHz (diff) | |
| download | linux-dev-7ca15a0ae865067aac8d36e27e0acbe4a8f1e70a.tar.xz linux-dev-7ca15a0ae865067aac8d36e27e0acbe4a8f1e70a.zip | |
mac80211: allow scanning for 5/10 MHz channels in IBSS
Use a chandef instead of just the channel for scanning, and enable
5/10 Mhz scanning for IBSS mode. Also reporting is changed to the new
inform_bss functions.
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Mathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 6da98c77496b..25eb35b01938 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -102,17 +102,8 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local) offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL; - if (local->scan_channel) { - chandef.chan = local->scan_channel; - /* If scanning on oper channel, use whatever channel-type - * is currently in use. - */ - if (chandef.chan == local->_oper_chandef.chan) { - chandef = local->_oper_chandef; - } else { - chandef.width = NL80211_CHAN_WIDTH_20_NOHT; - chandef.center_freq1 = chandef.chan->center_freq; - } + if (local->scan_chandef.chan) { + chandef = local->scan_chandef; } else if (local->tmp_channel) { chandef.chan = local->tmp_channel; chandef.width = NL80211_CHAN_WIDTH_20_NOHT; |