diff options
Diffstat (limited to 'net/mac80211/wext.c')
-rw-r--r-- | net/mac80211/wext.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index ce21d66b1023..deb4ecec122a 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c | |||
@@ -129,9 +129,6 @@ static int ieee80211_ioctl_siwgenie(struct net_device *dev, | |||
129 | 129 | ||
130 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 130 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
131 | 131 | ||
132 | if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME) | ||
133 | return -EOPNOTSUPP; | ||
134 | |||
135 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { | 132 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { |
136 | int ret = ieee80211_sta_set_extra_ie(sdata, extra, data->length); | 133 | int ret = ieee80211_sta_set_extra_ie(sdata, extra, data->length); |
137 | if (ret) | 134 | if (ret) |
@@ -208,14 +205,6 @@ static int ieee80211_ioctl_siwessid(struct net_device *dev, | |||
208 | 205 | ||
209 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 206 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
210 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { | 207 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { |
211 | if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME) { | ||
212 | if (len > IEEE80211_MAX_SSID_LEN) | ||
213 | return -EINVAL; | ||
214 | memcpy(sdata->u.mgd.ssid, ssid, len); | ||
215 | sdata->u.mgd.ssid_len = len; | ||
216 | return 0; | ||
217 | } | ||
218 | |||
219 | if (data->flags) | 208 | if (data->flags) |
220 | sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_SSID_SEL; | 209 | sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_SSID_SEL; |
221 | else | 210 | else |
@@ -274,11 +263,7 @@ static int ieee80211_ioctl_siwap(struct net_device *dev, | |||
274 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 263 | sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
275 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { | 264 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { |
276 | int ret; | 265 | int ret; |
277 | if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME) { | 266 | |
278 | memcpy(sdata->u.mgd.bssid, (u8 *) &ap_addr->sa_data, | ||
279 | ETH_ALEN); | ||
280 | return 0; | ||
281 | } | ||
282 | if (is_zero_ether_addr((u8 *) &ap_addr->sa_data)) | 267 | if (is_zero_ether_addr((u8 *) &ap_addr->sa_data)) |
283 | sdata->u.mgd.flags |= IEEE80211_STA_AUTO_BSSID_SEL | | 268 | sdata->u.mgd.flags |= IEEE80211_STA_AUTO_BSSID_SEL | |
284 | IEEE80211_STA_AUTO_CHANNEL_SEL; | 269 | IEEE80211_STA_AUTO_CHANNEL_SEL; |