Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a01ddafd authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

cfg80211: expect different rd in cfg80211 when intersecting 



When intersecting it is possible that set_regdom() was called
with a regulatory domain which we'll only use as an aid to
build a final regulatory domain.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b8295acd

net/wireless/reg.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -880,12 +880,13 @@ int set_regdom(const struct ieee80211_regdomain *rd) 
	}

	}





	/* This would make this whole thing pointless */

	/* This would make this whole thing pointless */

	if (!last_request->intersect)

		BUG_ON(rd != cfg80211_regdomain);

		BUG_ON(rd != cfg80211_regdomain);





	/* update all wiphys now with the new established regulatory domain */

	/* update all wiphys now with the new established regulatory domain */

	update_all_wiphy_regulatory(last_request->initiator);

	update_all_wiphy_regulatory(last_request->initiator);





	print_regdomain(rd);

	print_regdomain(cfg80211_regdomain);





	return r;

	return r;

}

}