From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 10 Dec 2010 16:10:44 +0000 (+0100)
Subject: mac80211: support IBSS RSN with SW crypto
X-Git-Tag: v2.6.38-rc1~476^2~104^2~4^2~82
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=207aba6018a7b1757b5248ced2b280d20790c498;p=linux.git

mac80211: support IBSS RSN with SW crypto

When software crypto is used, mac80211 will
support IBSS RSN, it doesn't depend on the
driver in that case.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index ae656b6e3bc2..f7bdb7c78879 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -517,11 +517,15 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
 	wiphy->mgmt_stypes = ieee80211_default_mgmt_stypes;
 
+	wiphy->privid = mac80211_wiphy_privid;
+
 	wiphy->flags |= WIPHY_FLAG_NETNS_OK |
 			WIPHY_FLAG_4ADDR_AP |
 			WIPHY_FLAG_4ADDR_STATION |
 			WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS;
-	wiphy->privid = mac80211_wiphy_privid;
+
+	if (!ops->set_key)
+		wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
 
 	wiphy->bss_priv_size = sizeof(struct ieee80211_bss);