]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mac80211: support IBSS RSN with SW crypto
authorJohannes Berg <johannes.berg@intel.com>
Fri, 10 Dec 2010 16:10:44 +0000 (17:10 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 13 Dec 2010 20:23:30 +0000 (15:23 -0500)
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>
net/mac80211/main.c

index ae656b6e3bc26699190e955e0ee03015d21eb364..f7bdb7c788799bf6a277a74e018b85a6cc61194c 100644 (file)
@@ -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);