From 070865b9d505daa9a612a73b9865e2ddc5ce96ed Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 10 Dec 2010 17:10:44 +0100 Subject: [PATCH] --- yaml --- r: 225249 b: refs/heads/master c: 207aba6018a7b1757b5248ced2b280d20790c498 h: refs/heads/master i: 225247: 085410db83c5182d44b3e80f61f4a49943e2b3a1 v: v3 --- [refs] | 2 +- trunk/net/mac80211/main.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 75a2961d5ae5..38c1e6fd919f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9abbfb27dd96361187bb3872b2c349a76f5e09e9 +refs/heads/master: 207aba6018a7b1757b5248ced2b280d20790c498 diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c index ae656b6e3bc2..f7bdb7c78879 100644 --- a/trunk/net/mac80211/main.c +++ b/trunk/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);