nl80211: renumber NL80211_FEATURE_FULL_AP_CLIENT_STATE (932dd97c) · Commits · 戴 / test

Adding the flag to mac80211 already without testing was clearly a mistake, one that we now pay for by having to reserve bit 13 forever. The problem is cfg80211 doesn't allow capability/rate changes for station entries that were added unassociated, so the station entries cannot be set up properly when marked associated. Change the NL80211_FEATURE_FULL_AP_CLIENT_STATE value to make it clear to userspace implementations that all current kernels don't actually support it, even though the previous bit is set, and of course also remove the flag from mac80211 until we test and fix the issues. Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

include/uapi/linux/nl80211.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -3471,8 +3471,9 @@ enum nl80211_feature_flags {
		NL80211_FEATURE_NEED_OBSS_SCAN = 1 << 10,
		NL80211_FEATURE_P2P_GO_CTWIN = 1 << 11,
		NL80211_FEATURE_P2P_GO_OPPPS = 1 << 12,
		NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 13,
		/* bit 13 is reserved */
		NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14,
		NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15,
		};

		/**

net/mac80211/main.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -572,8 +572,7 @@ 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_FULL_AP_CLIENT_STATE;
		NL80211_FEATURE_VIF_TXPOWER;

		if (!ops->hw_scan)
		wiphy->features \|= NL80211_FEATURE_LOW_PRIORITY_SCAN \|

Admin message