Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/wl12xx/wl1271_cmd.h

1 files changed, 5 insertions, 0 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 9eb02a340889..5e56e91c92c4 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -143,6 +143,11 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
                 return -EINVAL;
         }
 
+        /* reject WEP and TKIP keys if WEP failed to initialize */
+        if ((alg == ALG_WEP || alg == ALG_TKIP) &&
+            IS_ERR(sdata->local->wep_tx_tfm))
+                return -EINVAL;
+
         key = ieee80211_key_alloc(alg, key_idx, params->key_len, params->key,
                                   params->seq_len, params->seq);
         if (!key)