1 files changed, 9 insertions, 1 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 028f6430879d..af4733ba5be2 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1228,7 +1228,7 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev,
                            struct cfg80211_assoc_request *req)
 {
         struct ieee80211_sub_if_data *sdata;
-        int ret;
+        int ret, i;
 
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
@@ -1236,6 +1236,14 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev,
             !(sdata->u.mgd.flags & IEEE80211_STA_AUTHENTICATED))
                 return -ENOLINK; /* not authenticated */
 
+        sdata->u.mgd.flags &= ~IEEE80211_STA_TKIP_WEP_USED;
+
+        for (i = 0; i < req->crypto.n_ciphers_pairwise; i++)
+                if (req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP40 ||
+                    req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP ||
+                    req->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_WEP104)
+                        sdata->u.mgd.flags |= IEEE80211_STA_TKIP_WEP_USED;
+
         sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_BSSID_SEL;
         sdata->u.mgd.flags |= IEEE80211_STA_BSSID_SET;