diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-09 14:13:16 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-09 14:13:16 +0800 |
| commit | 0fd3f190b68b2246d463538a79f51dc9c9a975a7 (patch) | |
| tree | b82c790da60db95ebfe40503abbb5c5df29d05ca /net | |
| parent | 30597f811b54c4afcce752068ace660406ac7849 (diff) | |
| parent | ceafc84623c8ef94c13a87363277a595988b2b79 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rt
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/nl80211.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 62aebed7c6e2..dc200bf831ae 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2629,6 +2629,9 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info) if (!rdev->ops->get_key) return -EOPNOTSUPP; + if (!pairwise && mac_addr && !(rdev->wiphy.flags & WIPHY_FLAG_IBSS_RSN)) + return -ENOENT; + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); if (!msg) return -ENOMEM; @@ -2648,10 +2651,6 @@ static int nl80211_get_key(struct sk_buff *skb, struct genl_info *info) nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, mac_addr)) goto nla_put_failure; - if (pairwise && mac_addr && - !(rdev->wiphy.flags & WIPHY_FLAG_IBSS_RSN)) - return -ENOENT; - err = rdev_get_key(rdev, dev, key_idx, pairwise, mac_addr, &cookie, get_key_callback); @@ -2822,7 +2821,7 @@ static int nl80211_del_key(struct sk_buff *skb, struct genl_info *info) wdev_lock(dev->ieee80211_ptr); err = nl80211_key_allowed(dev->ieee80211_ptr); - if (key.type == NL80211_KEYTYPE_PAIRWISE && mac_addr && + if (key.type == NL80211_KEYTYPE_GROUP && mac_addr && !(rdev->wiphy.flags & WIPHY_FLAG_IBSS_RSN)) err = -ENOENT; |