mac80211: don't warn on AID field without top two MSBs set (c7c477b5) · Commits · 戴 / test

While the change between 802.11-2012 and 802.11-2016 to move from requiring APs to set the two top bits to now requiring them to be cleared was apparently unintentional and will be fixed, clients should either way assume that the top five bits are reserved and ignore them. Implement that in mac80211. Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/mac80211/mlme.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -2862,10 +2862,11 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
		aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
		capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);

		if ((aid & (BIT(15) \| BIT(14))) != (BIT(15) \| BIT(14)))
		sdata_info(sdata, "invalid AID value 0x%x; bits 15:14 not set\n",
		aid);
		aid &= ~(BIT(15) \| BIT(14));
		/*
		* The 5 MSB of the AID field are reserved
		* (802.11-2016 9.4.1.8 AID field)
		*/
		aid &= 0x7ff;

		ifmgd->broken_ap = false;

Admin message