Skip to content

Commit

Permalink
cfg80211: expect different rd in cfg80211 when intersecting
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luis R. Rodriguez authored and John W. Linville committed Nov 25, 2008
1 parent b8295ac commit a01ddaf
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit a01ddaf

Please sign in to comment.