aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/reg.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r--net/wireless/reg.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 845e2d326632..f062b8b7000a 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -880,12 +880,13 @@ int set_regdom(const struct ieee80211_regdomain *rd)
880 } 880 }
881 881
882 /* This would make this whole thing pointless */ 882 /* This would make this whole thing pointless */
883 BUG_ON(rd != cfg80211_regdomain); 883 if (!last_request->intersect)
884 BUG_ON(rd != cfg80211_regdomain);
884 885
885 /* update all wiphys now with the new established regulatory domain */ 886 /* update all wiphys now with the new established regulatory domain */
886 update_all_wiphy_regulatory(last_request->initiator); 887 update_all_wiphy_regulatory(last_request->initiator);
887 888
888 print_regdomain(rd); 889 print_regdomain(cfg80211_regdomain);
889 890
890 return r; 891 return r;
891} 892}