[PATCH] mac80211: advertise userspace MPM only if mesh is supported

[PATCH] mac80211: advertise userspace MPM only if mesh is supported

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

There's no danger in always advertising it, but it would
look a bit inconsistent so don't do it unless supported.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/mac80211/main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 1998f14..810e20c 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -556,8 +556,10 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 	wiphy->features |= NL80211_FEATURE_SK_TX_STATUS |
 			   NL80211_FEATURE_SAE |
 			   NL80211_FEATURE_HT_IBSS |
-			   NL80211_FEATURE_VIF_TXPOWER |
-			   NL80211_FEATURE_USERSPACE_MPM;
+			   NL80211_FEATURE_VIF_TXPOWER;
+#ifdef CONFIG_MAC80211_MESH
+	wiphy->features |= NL80211_FEATURE_USERSPACE_MPM;
+#endif
 
 	if (!ops->hw_scan)
 		wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |
-- 
1.8.0

Re: [PATCH] mac80211: advertise userspace MPM only if mesh is supported

[Johannes Berg]

On Fri, 2013-05-31 at 17:13 +0200, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> There's no danger in always advertising it, but it would
> look a bit inconsistent so don't do it unless supported.

Actually, this patch is pointless ... it'd _also_ have to check if the
driver supports mesh. I guess I'll just drop it completely.

johannes