---

yaml --- r: 247541 b: refs/heads/master c: 0e579d6 h: refs/heads/master i: 247539: 2d39ee1 v: v3
git-mirror · May 5, 2011 · cbe77f3 · cbe77f3
1 parent eea5a64
commit cbe77f3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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);