On Tue, 2008-11-04 at 18:50 -0800, Luis R. Rodriguez wrote: > 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@xxxxxxxxxxx> > --- > net/wireless/reg.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/net/wireless/reg.c b/net/wireless/reg.c > index 845e2d3..f062b8b 100644 > --- a/net/wireless/reg.c > +++ b/net/wireless/reg.c > @@ -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); Maybe the printing here should be removed? It seems confusing now. johannes
Attachment:
signature.asc
Description: This is a digitally signed message part
