1 files changed, 15 insertions, 18 deletions

diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 935c63ed3df..deb4ecec122 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -129,14 +129,12 @@ static int ieee80211_ioctl_siwgenie(struct net_device *dev,
 
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
-        if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME)
-                return -EOPNOTSUPP;
-
         if (sdata->vif.type == NL80211_IFTYPE_STATION) {
                 int ret = ieee80211_sta_set_extra_ie(sdata, extra, data->length);
                 if (ret)
                         return ret;
                 sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_BSSID_SEL;
+                sdata->u.mgd.flags &= ~IEEE80211_STA_EXT_SME;
                 ieee80211_sta_req_auth(sdata);
                 return 0;
         }
@@ -207,14 +205,6 @@ static int ieee80211_ioctl_siwessid(struct net_device *dev,
 
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         if (sdata->vif.type == NL80211_IFTYPE_STATION) {
-                if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME) {
-                        if (len > IEEE80211_MAX_SSID_LEN)
-                                return -EINVAL;
-                        memcpy(sdata->u.mgd.ssid, ssid, len);
-                        sdata->u.mgd.ssid_len = len;
-                        return 0;
-                }
-
                 if (data->flags)
                         sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_SSID_SEL;
                 else
@@ -224,6 +214,7 @@ static int ieee80211_ioctl_siwessid(struct net_device *dev,
                 if (ret)
                         return ret;
 
+                sdata->u.mgd.flags &= ~IEEE80211_STA_EXT_SME;
                 ieee80211_sta_req_auth(sdata);
                 return 0;
         } else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
@@ -272,11 +263,7 @@ static int ieee80211_ioctl_siwap(struct net_device *dev,
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         if (sdata->vif.type == NL80211_IFTYPE_STATION) {
                 int ret;
-                if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME) {
-                        memcpy(sdata->u.mgd.bssid, (u8 *) &ap_addr->sa_data,
-                               ETH_ALEN);
-                        return 0;
-                }
+
                 if (is_zero_ether_addr((u8 *) &ap_addr->sa_data))
                         sdata->u.mgd.flags |= IEEE80211_STA_AUTO_BSSID_SEL |
                                 IEEE80211_STA_AUTO_CHANNEL_SEL;
@@ -287,6 +274,7 @@ static int ieee80211_ioctl_siwap(struct net_device *dev,
                 ret = ieee80211_sta_set_bssid(sdata, (u8 *) &ap_addr->sa_data);
                 if (ret)
                         return ret;
+                sdata->u.mgd.flags &= ~IEEE80211_STA_EXT_SME;
                 ieee80211_sta_req_auth(sdata);
                 return 0;
         } else if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
@@ -630,7 +618,7 @@ static int ieee80211_ioctl_siwencode(struct net_device *dev,
         struct ieee80211_sub_if_data *sdata;
         int idx, i, alg = ALG_WEP;
         u8 bcaddr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-        int remove = 0;
+        int remove = 0, ret;
 
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
@@ -656,11 +644,20 @@ static int ieee80211_ioctl_siwencode(struct net_device *dev,
                 return 0;
         }
 
-        return ieee80211_set_encryption(
+        ret = ieee80211_set_encryption(
                 sdata, bcaddr,
                 idx, alg, remove,
                 !sdata->default_key,
                 keybuf, erq->length);
+
+        if (!ret) {
+                if (remove)
+                        sdata->u.mgd.flags &= ~IEEE80211_STA_TKIP_WEP_USED;
+                else
+                        sdata->u.mgd.flags |= IEEE80211_STA_TKIP_WEP_USED;
+        }
+
+        return ret;
 }