diff --git a/[refs] b/[refs]
index 76f3c5949027..8704def830d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a652052fedbd7869572c757dd2ffc2ed420c69d
+refs/heads/master: 9dca9c490146e787472bc05b264e043311a4c67b
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 7a4e4bffbc71..cf8d72196c65 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2031,6 +2031,8 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
 		auth_alg = WLAN_AUTH_OPEN;
 		break;
 	case NL80211_AUTHTYPE_SHARED_KEY:
+		if (IS_ERR(sdata->local->wep_tx_tfm))
+			return -EOPNOTSUPP;
 		auth_alg = WLAN_AUTH_SHARED_KEY;
 		break;
 	case NL80211_AUTHTYPE_FT: