Commit ab10c22b authored Sep 28, 2020 by Johannes Berg

nl80211: fix non-split wiphy information



When dumping wiphy information, we try to split the data into
many submessages, but for old userspace we still support the
old mode where this doesn't happen.

However, in this case we were not resetting our state correctly
and dumping multiple messages for each wiphy, which would have
broken such older userspace.

This was broken pretty much immediately afterwards because it
only worked in the original commit where non-split dumps didn't
have any more data than split dumps...

Fixes: fe1abafd ("nl80211: re-add channel width and extended capa advertising")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20200928130717.3e6d9c6bada2.Ie0f151a8d0d00a8e1e18f6a8c9244dd02496af67@changeid


Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent f8d504ca

net/wireless/nl80211.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2428,7 +2428,10 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev,
		* case we'll continue with more data in the next round,
		* but break unconditionally so unsplit data stops here.
		*/
		if (state->split)
		state->split_start++;
		else
		state->split_start = 0;
		break;
		case 9:
		if (nl80211_send_mgmt_stypes(msg, mgmt_stypes))

Admin message