diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-12-10 11:10:44 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:23:30 -0500 |
commit | 207aba6018a7b1757b5248ced2b280d20790c498 (patch) | |
tree | 389a28450425d266f077d6bb8119d5e6e1666779 /net/mac80211/main.c | |
parent | 9abbfb27dd96361187bb3872b2c349a76f5e09e9 (diff) |
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>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
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, | |||
517 | 517 | ||
518 | wiphy->mgmt_stypes = ieee80211_default_mgmt_stypes; | 518 | wiphy->mgmt_stypes = ieee80211_default_mgmt_stypes; |
519 | 519 | ||
520 | wiphy->privid = mac80211_wiphy_privid; | ||
521 | |||
520 | wiphy->flags |= WIPHY_FLAG_NETNS_OK | | 522 | wiphy->flags |= WIPHY_FLAG_NETNS_OK | |
521 | WIPHY_FLAG_4ADDR_AP | | 523 | WIPHY_FLAG_4ADDR_AP | |
522 | WIPHY_FLAG_4ADDR_STATION | | 524 | WIPHY_FLAG_4ADDR_STATION | |
523 | WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS; | 525 | WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS; |
524 | wiphy->privid = mac80211_wiphy_privid; | 526 | |
527 | if (!ops->set_key) | ||
528 | wiphy->flags |= WIPHY_FLAG_IBSS_RSN; | ||
525 | 529 | ||
526 | wiphy->bss_priv_size = sizeof(struct ieee80211_bss); | 530 | wiphy->bss_priv_size = sizeof(struct ieee80211_bss); |
527 | 531 | ||