aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-07-21 04:09:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-07-21 15:13:42 -0400
commit9dca9c490146e787472bc05b264e043311a4c67b (patch)
tree67545964ffea81aa88e17d1a2dffe9a43f9ca973 /net/mac80211
parent5a652052fedbd7869572c757dd2ffc2ed420c69d (diff)
mac80211: refuse shared key auth when WEP is unavailable
When WEP is not available, we should reject shared key authentication because it could never succeed. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 7a4e4bffbc71..cf8d72196c65 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2031,6 +2031,8 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
2031 auth_alg = WLAN_AUTH_OPEN; 2031 auth_alg = WLAN_AUTH_OPEN;
2032 break; 2032 break;
2033 case NL80211_AUTHTYPE_SHARED_KEY: 2033 case NL80211_AUTHTYPE_SHARED_KEY:
2034 if (IS_ERR(sdata->local->wep_tx_tfm))
2035 return -EOPNOTSUPP;
2034 auth_alg = WLAN_AUTH_SHARED_KEY; 2036 auth_alg = WLAN_AUTH_SHARED_KEY;
2035 break; 2037 break;
2036 case NL80211_AUTHTYPE_FT: 2038 case NL80211_AUTHTYPE_FT: