diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-02-10 15:25:41 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-13 13:45:26 -0500 |
commit | 60b22511921fe79b2a94a27c09cadfd32fcef5d5 (patch) | |
tree | 9e77ff55f56493f4bc80b43752ba99c9c5403f0c /net/mac80211/cfg.c | |
parent | e4e5e2b0b83c816e581ca4671569306bcba77667 (diff) |
mac80211: reject extra IEs for probe request when hw_scan
We cannot currently hand off extra IEs to hw_scan, so reject
configuring extra IEs for probe request frames when hw_scan
is set.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Jouni Malinen <j@w1.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r-- | net/mac80211/cfg.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index a1a1344c5c4b..42d692fd9bec 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -1176,11 +1176,16 @@ static int ieee80211_set_channel(struct wiphy *wiphy, | |||
1176 | return ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL); | 1176 | return ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL); |
1177 | } | 1177 | } |
1178 | 1178 | ||
1179 | static int set_mgmt_extra_ie_sta(struct ieee80211_if_sta *ifsta, u8 subtype, | 1179 | static int set_mgmt_extra_ie_sta(struct ieee80211_sub_if_data *sdata, |
1180 | u8 *ies, size_t ies_len) | 1180 | u8 subtype, u8 *ies, size_t ies_len) |
1181 | { | 1181 | { |
1182 | struct ieee80211_local *local = sdata->local; | ||
1183 | struct ieee80211_if_sta *ifsta = &sdata->u.sta; | ||
1184 | |||
1182 | switch (subtype) { | 1185 | switch (subtype) { |
1183 | case IEEE80211_STYPE_PROBE_REQ >> 4: | 1186 | case IEEE80211_STYPE_PROBE_REQ >> 4: |
1187 | if (local->ops->hw_scan) | ||
1188 | break; | ||
1184 | kfree(ifsta->ie_probereq); | 1189 | kfree(ifsta->ie_probereq); |
1185 | ifsta->ie_probereq = ies; | 1190 | ifsta->ie_probereq = ies; |
1186 | ifsta->ie_probereq_len = ies_len; | 1191 | ifsta->ie_probereq_len = ies_len; |
@@ -1244,7 +1249,7 @@ static int ieee80211_set_mgmt_extra_ie(struct wiphy *wiphy, | |||
1244 | switch (sdata->vif.type) { | 1249 | switch (sdata->vif.type) { |
1245 | case NL80211_IFTYPE_STATION: | 1250 | case NL80211_IFTYPE_STATION: |
1246 | case NL80211_IFTYPE_ADHOC: | 1251 | case NL80211_IFTYPE_ADHOC: |
1247 | ret = set_mgmt_extra_ie_sta(&sdata->u.sta, params->subtype, | 1252 | ret = set_mgmt_extra_ie_sta(sdata, params->subtype, |
1248 | ies, ies_len); | 1253 | ies, ies_len); |
1249 | break; | 1254 | break; |
1250 | default: | 1255 | default: |