aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-11-26 09:15:24 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-12-05 09:32:11 -0500
commit72bdcf34380917260da41e3c49e10edee04bc5cd (patch)
treecbfb8e389f58514febf47ea62781517a9df42f25 /net/mac80211
parent72eaa43a532b4156966444779829a986a4432f11 (diff)
nl80211: Add frequency configuration (including HT40)
This patch adds new NL80211_CMD_SET_WIPHY attributes NL80211_ATTR_WIPHY_FREQ and NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET to allow userspace to set the operating channel (e.g., hostapd for AP mode). Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/cfg.c13
-rw-r--r--net/mac80211/ieee80211_i.h1
-rw-r--r--net/mac80211/main.c30
-rw-r--r--net/mac80211/util.c1
4 files changed, 41 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 16423f94801b..7a7a6c176dc5 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1095,6 +1095,18 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy,
1095 return 0; 1095 return 0;
1096} 1096}
1097 1097
1098static int ieee80211_set_channel(struct wiphy *wiphy,
1099 struct ieee80211_channel *chan,
1100 enum nl80211_sec_chan_offset sec_chan_offset)
1101{
1102 struct ieee80211_local *local = wiphy_priv(wiphy);
1103
1104 local->oper_channel = chan;
1105 local->oper_sec_chan_offset = sec_chan_offset;
1106
1107 return ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
1108}
1109
1098struct cfg80211_ops mac80211_config_ops = { 1110struct cfg80211_ops mac80211_config_ops = {
1099 .add_virtual_intf = ieee80211_add_iface, 1111 .add_virtual_intf = ieee80211_add_iface,
1100 .del_virtual_intf = ieee80211_del_iface, 1112 .del_virtual_intf = ieee80211_del_iface,
@@ -1122,4 +1134,5 @@ struct cfg80211_ops mac80211_config_ops = {
1122#endif 1134#endif
1123 .change_bss = ieee80211_change_bss, 1135 .change_bss = ieee80211_change_bss,
1124 .set_txq_params = ieee80211_set_txq_params, 1136 .set_txq_params = ieee80211_set_txq_params,
1137 .set_channel = ieee80211_set_channel,
1125}; 1138};
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 155a20410017..527205f8c1a1 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -626,6 +626,7 @@ struct ieee80211_local {
626 struct delayed_work scan_work; 626 struct delayed_work scan_work;
627 struct ieee80211_sub_if_data *scan_sdata; 627 struct ieee80211_sub_if_data *scan_sdata;
628 struct ieee80211_channel *oper_channel, *scan_channel; 628 struct ieee80211_channel *oper_channel, *scan_channel;
629 enum nl80211_sec_chan_offset oper_sec_chan_offset;
629 u8 scan_ssid[IEEE80211_MAX_SSID_LEN]; 630 u8 scan_ssid[IEEE80211_MAX_SSID_LEN];
630 size_t scan_ssid_len; 631 size_t scan_ssid_len;
631 struct list_head bss_list; 632 struct list_head bss_list;
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index cec9b6d3e1ce..29c3ecf7e914 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -195,20 +195,42 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
195 struct ieee80211_channel *chan; 195 struct ieee80211_channel *chan;
196 int ret = 0; 196 int ret = 0;
197 int power; 197 int power;
198 enum nl80211_sec_chan_offset sec_chan_offset;
198 199
199 might_sleep(); 200 might_sleep();
200 201
201 if (local->sw_scanning) 202 if (local->sw_scanning) {
202 chan = local->scan_channel; 203 chan = local->scan_channel;
203 else 204 sec_chan_offset = NL80211_SEC_CHAN_NO_HT;
205 } else {
204 chan = local->oper_channel; 206 chan = local->oper_channel;
207 sec_chan_offset = local->oper_sec_chan_offset;
208 }
205 209
206 if (chan != local->hw.conf.channel) { 210 if (chan != local->hw.conf.channel ||
211 sec_chan_offset != local->hw.conf.ht.sec_chan_offset) {
207 local->hw.conf.channel = chan; 212 local->hw.conf.channel = chan;
213 switch (sec_chan_offset) {
214 case NL80211_SEC_CHAN_NO_HT:
215 local->hw.conf.ht.enabled = false;
216 local->hw.conf.ht.sec_chan_offset = 0;
217 break;
218 case NL80211_SEC_CHAN_DISABLED:
219 local->hw.conf.ht.enabled = true;
220 local->hw.conf.ht.sec_chan_offset = 0;
221 break;
222 case NL80211_SEC_CHAN_BELOW:
223 local->hw.conf.ht.enabled = true;
224 local->hw.conf.ht.sec_chan_offset = -1;
225 break;
226 case NL80211_SEC_CHAN_ABOVE:
227 local->hw.conf.ht.enabled = true;
228 local->hw.conf.ht.sec_chan_offset = 1;
229 break;
230 }
208 changed |= IEEE80211_CONF_CHANGE_CHANNEL; 231 changed |= IEEE80211_CONF_CHANGE_CHANNEL;
209 } 232 }
210 233
211
212 if (!local->hw.conf.power_level) 234 if (!local->hw.conf.power_level)
213 power = chan->max_power; 235 power = chan->max_power;
214 else 236 else
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 0f841317c7e9..505d68f344ce 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -641,6 +641,7 @@ int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz)
641 chan->flags & IEEE80211_CHAN_NO_IBSS) 641 chan->flags & IEEE80211_CHAN_NO_IBSS)
642 return ret; 642 return ret;
643 local->oper_channel = chan; 643 local->oper_channel = chan;
644 local->oper_sec_chan_offset = NL80211_SEC_CHAN_NO_HT;
644 645
645 if (local->sw_scanning || local->hw_scanning) 646 if (local->sw_scanning || local->hw_scanning)
646 ret = 0; 647 ret = 0;