From: Johannes Berg <johannes.berg@xxxxxxxxx> 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@xxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
