From cbe77f3551631004f87892b206aa684c8dbede99 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Tue, 3 May 2011 22:45:16 -0700
Subject: [PATCH] --- yaml --- r: 247541 b: refs/heads/master c:
 0e579d6a8f4aea346da818f13ee71401c125e639 h: refs/heads/master i:   247539:
 2d39ee143c825d45ff8547b4079babb4dec59b43 v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index b377b9133684..bfe44ece8ec9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 270e58e8898c8be40451ebee45b6c9b5bd5db04b
+refs/heads/master: 0e579d6a8f4aea346da818f13ee71401c125e639
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 0efa7fd01150..ab77f943dc04 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -1682,14 +1682,6 @@ static int nl80211_set_key(struct sk_buff *skb, struct genl_info *info)
 		if (err)
 			goto out;
 
-		if (!(rdev->wiphy.flags &
-				WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS)) {
-			if (!key.def_uni || !key.def_multi) {
-				err = -EOPNOTSUPP;
-				goto out;
-			}
-		}
-
 		err = rdev->ops->set_default_key(&rdev->wiphy, dev, key.idx,
 						 key.def_uni, key.def_multi);