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: Luis R. Rodriguez <lrodriguez@atheros.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
b8295acdc3
commit
a01ddafd43
|
@ -880,12 +880,13 @@ int set_regdom(const struct ieee80211_regdomain *rd)
|
|||
}
|
||||
|
||||
/* This would make this whole thing pointless */
|
||||
BUG_ON(rd != cfg80211_regdomain);
|
||||
if (!last_request->intersect)
|
||||
BUG_ON(rd != cfg80211_regdomain);
|
||||
|
||||
/* update all wiphys now with the new established regulatory domain */
|
||||
update_all_wiphy_regulatory(last_request->initiator);
|
||||
|
||||
print_regdomain(rd);
|
||||
print_regdomain(cfg80211_regdomain);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue