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.c1164
1 files changed, 923 insertions, 241 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index bd0a16c3de5e..58df98f10990 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -42,38 +42,6 @@
42#include "core.h" 42#include "core.h"
43#include "reg.h" 43#include "reg.h"
44 44
45/**
46 * struct regulatory_request - receipt of last regulatory request
47 *
48 * @wiphy: this is set if this request's initiator is
49 * %REGDOM_SET_BY_COUNTRY_IE or %REGDOM_SET_BY_DRIVER. This
50 * can be used by the wireless core to deal with conflicts
51 * and potentially inform users of which devices specifically
52 * cased the conflicts.
53 * @initiator: indicates who sent this request, could be any of
54 * of those set in reg_set_by, %REGDOM_SET_BY_*
55 * @alpha2: the ISO / IEC 3166 alpha2 country code of the requested
56 * regulatory domain. We have a few special codes:
57 * 00 - World regulatory domain
58 * 99 - built by driver but a specific alpha2 cannot be determined
59 * 98 - result of an intersection between two regulatory domains
60 * @intersect: indicates whether the wireless core should intersect
61 * the requested regulatory domain with the presently set regulatory
62 * domain.
63 * @country_ie_checksum: checksum of the last processed and accepted
64 * country IE
65 * @country_ie_env: lets us know if the AP is telling us we are outdoor,
66 * indoor, or if it doesn't matter
67 */
68struct regulatory_request {
69 struct wiphy *wiphy;
70 enum reg_set_by initiator;
71 char alpha2[2];
72 bool intersect;
73 u32 country_ie_checksum;
74 enum environment_cap country_ie_env;
75};
76
77/* Receipt of information from last regulatory request */ 45/* Receipt of information from last regulatory request */
78static struct regulatory_request *last_request; 46static struct regulatory_request *last_request;
79 47
@@ -86,22 +54,52 @@ static u32 supported_bandwidths[] = {
86 MHZ_TO_KHZ(20), 54 MHZ_TO_KHZ(20),
87}; 55};
88 56
89/* Central wireless core regulatory domains, we only need two, 57/*
58 * Central wireless core regulatory domains, we only need two,
90 * the current one and a world regulatory domain in case we have no 59 * the current one and a world regulatory domain in case we have no
91 * information to give us an alpha2 */ 60 * information to give us an alpha2
92static const struct ieee80211_regdomain *cfg80211_regdomain; 61 */
62const struct ieee80211_regdomain *cfg80211_regdomain;
93 63
94/* We use this as a place for the rd structure built from the 64/*
65 * We use this as a place for the rd structure built from the
95 * last parsed country IE to rest until CRDA gets back to us with 66 * last parsed country IE to rest until CRDA gets back to us with
96 * what it thinks should apply for the same country */ 67 * what it thinks should apply for the same country
68 */
97static const struct ieee80211_regdomain *country_ie_regdomain; 69static const struct ieee80211_regdomain *country_ie_regdomain;
98 70
71/* Used to queue up regulatory hints */
72static LIST_HEAD(reg_requests_list);
73static spinlock_t reg_requests_lock;
74
75/* Used to queue up beacon hints for review */
76static LIST_HEAD(reg_pending_beacons);
77static spinlock_t reg_pending_beacons_lock;
78
79/* Used to keep track of processed beacon hints */
80static LIST_HEAD(reg_beacon_list);
81
82struct reg_beacon {
83 struct list_head list;
84 struct ieee80211_channel chan;
85};
86
99/* We keep a static world regulatory domain in case of the absence of CRDA */ 87/* We keep a static world regulatory domain in case of the absence of CRDA */
100static const struct ieee80211_regdomain world_regdom = { 88static const struct ieee80211_regdomain world_regdom = {
101 .n_reg_rules = 1, 89 .n_reg_rules = 3,
102 .alpha2 = "00", 90 .alpha2 = "00",
103 .reg_rules = { 91 .reg_rules = {
104 REG_RULE(2412-10, 2462+10, 40, 6, 20, 92 /* IEEE 802.11b/g, channels 1..11 */
93 REG_RULE(2412-10, 2462+10, 40, 6, 20, 0),
94 /* IEEE 802.11a, channel 36..48 */
95 REG_RULE(5180-10, 5240+10, 40, 6, 23,
96 NL80211_RRF_PASSIVE_SCAN |
97 NL80211_RRF_NO_IBSS),
98
99 /* NB: 5260 MHz - 5700 MHz requies DFS */
100
101 /* IEEE 802.11a, channel 149..165 */
102 REG_RULE(5745-10, 5825+10, 40, 6, 23,
105 NL80211_RRF_PASSIVE_SCAN | 103 NL80211_RRF_PASSIVE_SCAN |
106 NL80211_RRF_NO_IBSS), 104 NL80211_RRF_NO_IBSS),
107 } 105 }
@@ -115,9 +113,11 @@ static char *ieee80211_regdom = "US";
115module_param(ieee80211_regdom, charp, 0444); 113module_param(ieee80211_regdom, charp, 0444);
116MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain code"); 114MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain code");
117 115
118/* We assume 40 MHz bandwidth for the old regulatory work. 116/*
117 * We assume 40 MHz bandwidth for the old regulatory work.
119 * We make emphasis we are using the exact same frequencies 118 * We make emphasis we are using the exact same frequencies
120 * as before */ 119 * as before
120 */
121 121
122static const struct ieee80211_regdomain us_regdom = { 122static const struct ieee80211_regdomain us_regdom = {
123 .n_reg_rules = 6, 123 .n_reg_rules = 6,
@@ -156,8 +156,10 @@ static const struct ieee80211_regdomain jp_regdom = {
156 156
157static const struct ieee80211_regdomain eu_regdom = { 157static const struct ieee80211_regdomain eu_regdom = {
158 .n_reg_rules = 6, 158 .n_reg_rules = 6,
159 /* This alpha2 is bogus, we leave it here just for stupid 159 /*
160 * backward compatibility */ 160 * This alpha2 is bogus, we leave it here just for stupid
161 * backward compatibility
162 */
161 .alpha2 = "EU", 163 .alpha2 = "EU",
162 .reg_rules = { 164 .reg_rules = {
163 /* IEEE 802.11b/g, channels 1..13 */ 165 /* IEEE 802.11b/g, channels 1..13 */
@@ -226,8 +228,10 @@ static void reset_regdomains(void)
226 cfg80211_regdomain = NULL; 228 cfg80211_regdomain = NULL;
227} 229}
228 230
229/* Dynamic world regulatory domain requested by the wireless 231/*
230 * core upon initialization */ 232 * Dynamic world regulatory domain requested by the wireless
233 * core upon initialization
234 */
231static void update_world_regdomain(const struct ieee80211_regdomain *rd) 235static void update_world_regdomain(const struct ieee80211_regdomain *rd)
232{ 236{
233 BUG_ON(!last_request); 237 BUG_ON(!last_request);
@@ -268,8 +272,10 @@ static bool is_unknown_alpha2(const char *alpha2)
268{ 272{
269 if (!alpha2) 273 if (!alpha2)
270 return false; 274 return false;
271 /* Special case where regulatory domain was built by driver 275 /*
272 * but a specific alpha2 cannot be determined */ 276 * Special case where regulatory domain was built by driver
277 * but a specific alpha2 cannot be determined
278 */
273 if (alpha2[0] == '9' && alpha2[1] == '9') 279 if (alpha2[0] == '9' && alpha2[1] == '9')
274 return true; 280 return true;
275 return false; 281 return false;
@@ -279,9 +285,11 @@ static bool is_intersected_alpha2(const char *alpha2)
279{ 285{
280 if (!alpha2) 286 if (!alpha2)
281 return false; 287 return false;
282 /* Special case where regulatory domain is the 288 /*
289 * Special case where regulatory domain is the
283 * result of an intersection between two regulatory domain 290 * result of an intersection between two regulatory domain
284 * structures */ 291 * structures
292 */
285 if (alpha2[0] == '9' && alpha2[1] == '8') 293 if (alpha2[0] == '9' && alpha2[1] == '8')
286 return true; 294 return true;
287 return false; 295 return false;
@@ -306,8 +314,10 @@ static bool alpha2_equal(const char *alpha2_x, const char *alpha2_y)
306 return false; 314 return false;
307} 315}
308 316
309static bool regdom_changed(const char *alpha2) 317static bool regdom_changes(const char *alpha2)
310{ 318{
319 assert_cfg80211_lock();
320
311 if (!cfg80211_regdomain) 321 if (!cfg80211_regdomain)
312 return true; 322 return true;
313 if (alpha2_equal(cfg80211_regdomain->alpha2, alpha2)) 323 if (alpha2_equal(cfg80211_regdomain->alpha2, alpha2))
@@ -334,8 +344,10 @@ static bool country_ie_integrity_changes(u32 checksum)
334 return false; 344 return false;
335} 345}
336 346
337/* This lets us keep regulatory code which is updated on a regulatory 347/*
338 * basis in userspace. */ 348 * This lets us keep regulatory code which is updated on a regulatory
349 * basis in userspace.
350 */
339static int call_crda(const char *alpha2) 351static int call_crda(const char *alpha2)
340{ 352{
341 char country_env[9 + 2] = "COUNTRY="; 353 char country_env[9 + 2] = "COUNTRY=";
@@ -447,10 +459,12 @@ static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range,
447#undef ONE_GHZ_IN_KHZ 459#undef ONE_GHZ_IN_KHZ
448} 460}
449 461
450/* Converts a country IE to a regulatory domain. A regulatory domain 462/*
463 * Converts a country IE to a regulatory domain. A regulatory domain
451 * structure has a lot of information which the IE doesn't yet have, 464 * structure has a lot of information which the IE doesn't yet have,
452 * so for the other values we use upper max values as we will intersect 465 * so for the other values we use upper max values as we will intersect
453 * with our userspace regulatory agent to get lower bounds. */ 466 * with our userspace regulatory agent to get lower bounds.
467 */
454static struct ieee80211_regdomain *country_ie_2_rd( 468static struct ieee80211_regdomain *country_ie_2_rd(
455 u8 *country_ie, 469 u8 *country_ie,
456 u8 country_ie_len, 470 u8 country_ie_len,
@@ -495,9 +509,11 @@ static struct ieee80211_regdomain *country_ie_2_rd(
495 509
496 *checksum ^= ((flags ^ alpha2[0] ^ alpha2[1]) << 8); 510 *checksum ^= ((flags ^ alpha2[0] ^ alpha2[1]) << 8);
497 511
498 /* We need to build a reg rule for each triplet, but first we must 512 /*
513 * We need to build a reg rule for each triplet, but first we must
499 * calculate the number of reg rules we will need. We will need one 514 * calculate the number of reg rules we will need. We will need one
500 * for each channel subband */ 515 * for each channel subband
516 */
501 while (country_ie_len >= 3) { 517 while (country_ie_len >= 3) {
502 int end_channel = 0; 518 int end_channel = 0;
503 struct ieee80211_country_ie_triplet *triplet = 519 struct ieee80211_country_ie_triplet *triplet =
@@ -535,9 +551,11 @@ static struct ieee80211_regdomain *country_ie_2_rd(
535 if (cur_sub_max_channel < cur_channel) 551 if (cur_sub_max_channel < cur_channel)
536 return NULL; 552 return NULL;
537 553
538 /* Do not allow overlapping channels. Also channels 554 /*
555 * Do not allow overlapping channels. Also channels
539 * passed in each subband must be monotonically 556 * passed in each subband must be monotonically
540 * increasing */ 557 * increasing
558 */
541 if (last_sub_max_channel) { 559 if (last_sub_max_channel) {
542 if (cur_channel <= last_sub_max_channel) 560 if (cur_channel <= last_sub_max_channel)
543 return NULL; 561 return NULL;
@@ -545,10 +563,12 @@ static struct ieee80211_regdomain *country_ie_2_rd(
545 return NULL; 563 return NULL;
546 } 564 }
547 565
548 /* When dot11RegulatoryClassesRequired is supported 566 /*
567 * When dot11RegulatoryClassesRequired is supported
549 * we can throw ext triplets as part of this soup, 568 * we can throw ext triplets as part of this soup,
550 * for now we don't care when those change as we 569 * for now we don't care when those change as we
551 * don't support them */ 570 * don't support them
571 */
552 *checksum ^= ((cur_channel ^ cur_sub_max_channel) << 8) | 572 *checksum ^= ((cur_channel ^ cur_sub_max_channel) << 8) |
553 ((cur_sub_max_channel ^ cur_sub_max_channel) << 16) | 573 ((cur_sub_max_channel ^ cur_sub_max_channel) << 16) |
554 ((triplet->chans.max_power ^ cur_sub_max_channel) << 24); 574 ((triplet->chans.max_power ^ cur_sub_max_channel) << 24);
@@ -559,8 +579,10 @@ static struct ieee80211_regdomain *country_ie_2_rd(
559 country_ie_len -= 3; 579 country_ie_len -= 3;
560 num_rules++; 580 num_rules++;
561 581
562 /* Note: this is not a IEEE requirement but 582 /*
563 * simply a memory requirement */ 583 * Note: this is not a IEEE requirement but
584 * simply a memory requirement
585 */
564 if (num_rules > NL80211_MAX_SUPP_REG_RULES) 586 if (num_rules > NL80211_MAX_SUPP_REG_RULES)
565 return NULL; 587 return NULL;
566 } 588 }
@@ -588,8 +610,10 @@ static struct ieee80211_regdomain *country_ie_2_rd(
588 struct ieee80211_freq_range *freq_range = NULL; 610 struct ieee80211_freq_range *freq_range = NULL;
589 struct ieee80211_power_rule *power_rule = NULL; 611 struct ieee80211_power_rule *power_rule = NULL;
590 612
591 /* Must parse if dot11RegulatoryClassesRequired is true, 613 /*
592 * we don't support this yet */ 614 * Must parse if dot11RegulatoryClassesRequired is true,
615 * we don't support this yet
616 */
593 if (triplet->ext.reg_extension_id >= 617 if (triplet->ext.reg_extension_id >=
594 IEEE80211_COUNTRY_EXTENSION_ID) { 618 IEEE80211_COUNTRY_EXTENSION_ID) {
595 country_ie += 3; 619 country_ie += 3;
@@ -611,10 +635,12 @@ static struct ieee80211_regdomain *country_ie_2_rd(
611 end_channel = triplet->chans.first_channel + 635 end_channel = triplet->chans.first_channel +
612 (4 * (triplet->chans.num_channels - 1)); 636 (4 * (triplet->chans.num_channels - 1));
613 637
614 /* The +10 is since the regulatory domain expects 638 /*
639 * The +10 is since the regulatory domain expects
615 * the actual band edge, not the center of freq for 640 * the actual band edge, not the center of freq for
616 * its start and end freqs, assuming 20 MHz bandwidth on 641 * its start and end freqs, assuming 20 MHz bandwidth on
617 * the channels passed */ 642 * the channels passed
643 */
618 freq_range->start_freq_khz = 644 freq_range->start_freq_khz =
619 MHZ_TO_KHZ(ieee80211_channel_to_frequency( 645 MHZ_TO_KHZ(ieee80211_channel_to_frequency(
620 triplet->chans.first_channel) - 10); 646 triplet->chans.first_channel) - 10);
@@ -622,9 +648,11 @@ static struct ieee80211_regdomain *country_ie_2_rd(
622 MHZ_TO_KHZ(ieee80211_channel_to_frequency( 648 MHZ_TO_KHZ(ieee80211_channel_to_frequency(
623 end_channel) + 10); 649 end_channel) + 10);
624 650
625 /* Large arbitrary values, we intersect later */ 651 /*
626 /* Increment this if we ever support >= 40 MHz channels 652 * These are large arbitrary values we use to intersect later.
627 * in IEEE 802.11 */ 653 * Increment this if we ever support >= 40 MHz channels
654 * in IEEE 802.11
655 */
628 freq_range->max_bandwidth_khz = MHZ_TO_KHZ(40); 656 freq_range->max_bandwidth_khz = MHZ_TO_KHZ(40);
629 power_rule->max_antenna_gain = DBI_TO_MBI(100); 657 power_rule->max_antenna_gain = DBI_TO_MBI(100);
630 power_rule->max_eirp = DBM_TO_MBM(100); 658 power_rule->max_eirp = DBM_TO_MBM(100);
@@ -640,8 +668,10 @@ static struct ieee80211_regdomain *country_ie_2_rd(
640} 668}
641 669
642 670
643/* Helper for regdom_intersect(), this does the real 671/*
644 * mathematical intersection fun */ 672 * Helper for regdom_intersect(), this does the real
673 * mathematical intersection fun
674 */
645static int reg_rules_intersect( 675static int reg_rules_intersect(
646 const struct ieee80211_reg_rule *rule1, 676 const struct ieee80211_reg_rule *rule1,
647 const struct ieee80211_reg_rule *rule2, 677 const struct ieee80211_reg_rule *rule2,
@@ -719,11 +749,13 @@ static struct ieee80211_regdomain *regdom_intersect(
719 if (!rd1 || !rd2) 749 if (!rd1 || !rd2)
720 return NULL; 750 return NULL;
721 751
722 /* First we get a count of the rules we'll need, then we actually 752 /*
753 * First we get a count of the rules we'll need, then we actually
723 * build them. This is to so we can malloc() and free() a 754 * build them. This is to so we can malloc() and free() a
724 * regdomain once. The reason we use reg_rules_intersect() here 755 * regdomain once. The reason we use reg_rules_intersect() here
725 * is it will return -EINVAL if the rule computed makes no sense. 756 * is it will return -EINVAL if the rule computed makes no sense.
726 * All rules that do check out OK are valid. */ 757 * All rules that do check out OK are valid.
758 */
727 759
728 for (x = 0; x < rd1->n_reg_rules; x++) { 760 for (x = 0; x < rd1->n_reg_rules; x++) {
729 rule1 = &rd1->reg_rules[x]; 761 rule1 = &rd1->reg_rules[x];
@@ -751,14 +783,18 @@ static struct ieee80211_regdomain *regdom_intersect(
751 rule1 = &rd1->reg_rules[x]; 783 rule1 = &rd1->reg_rules[x];
752 for (y = 0; y < rd2->n_reg_rules; y++) { 784 for (y = 0; y < rd2->n_reg_rules; y++) {
753 rule2 = &rd2->reg_rules[y]; 785 rule2 = &rd2->reg_rules[y];
754 /* This time around instead of using the stack lets 786 /*
787 * This time around instead of using the stack lets
755 * write to the target rule directly saving ourselves 788 * write to the target rule directly saving ourselves
756 * a memcpy() */ 789 * a memcpy()
790 */
757 intersected_rule = &rd->reg_rules[rule_idx]; 791 intersected_rule = &rd->reg_rules[rule_idx];
758 r = reg_rules_intersect(rule1, rule2, 792 r = reg_rules_intersect(rule1, rule2,
759 intersected_rule); 793 intersected_rule);
760 /* No need to memset here the intersected rule here as 794 /*
761 * we're not using the stack anymore */ 795 * No need to memset here the intersected rule here as
796 * we're not using the stack anymore
797 */
762 if (r) 798 if (r)
763 continue; 799 continue;
764 rule_idx++; 800 rule_idx++;
@@ -777,8 +813,10 @@ static struct ieee80211_regdomain *regdom_intersect(
777 return rd; 813 return rd;
778} 814}
779 815
780/* XXX: add support for the rest of enum nl80211_reg_rule_flags, we may 816/*
781 * want to just have the channel structure use these */ 817 * XXX: add support for the rest of enum nl80211_reg_rule_flags, we may
818 * want to just have the channel structure use these
819 */
782static u32 map_regdom_flags(u32 rd_flags) 820static u32 map_regdom_flags(u32 rd_flags)
783{ 821{
784 u32 channel_flags = 0; 822 u32 channel_flags = 0;
@@ -791,48 +829,45 @@ static u32 map_regdom_flags(u32 rd_flags)
791 return channel_flags; 829 return channel_flags;
792} 830}
793 831
794/** 832static int freq_reg_info_regd(struct wiphy *wiphy,
795 * freq_reg_info - get regulatory information for the given frequency 833 u32 center_freq,
796 * @center_freq: Frequency in KHz for which we want regulatory information for 834 u32 *bandwidth,
797 * @bandwidth: the bandwidth requirement you have in KHz, if you do not have one 835 const struct ieee80211_reg_rule **reg_rule,
798 * you can set this to 0. If this frequency is allowed we then set 836 const struct ieee80211_regdomain *custom_regd)
799 * this value to the maximum allowed bandwidth.
800 * @reg_rule: the regulatory rule which we have for this frequency
801 *
802 * Use this function to get the regulatory rule for a specific frequency on
803 * a given wireless device. If the device has a specific regulatory domain
804 * it wants to follow we respect that unless a country IE has been received
805 * and processed already.
806 *
807 * Returns 0 if it was able to find a valid regulatory rule which does
808 * apply to the given center_freq otherwise it returns non-zero. It will
809 * also return -ERANGE if we determine the given center_freq does not even have
810 * a regulatory rule for a frequency range in the center_freq's band. See
811 * freq_in_rule_band() for our current definition of a band -- this is purely
812 * subjective and right now its 802.11 specific.
813 */
814static int freq_reg_info(u32 center_freq, u32 *bandwidth,
815 const struct ieee80211_reg_rule **reg_rule)
816{ 837{
817 int i; 838 int i;
818 bool band_rule_found = false; 839 bool band_rule_found = false;
840 const struct ieee80211_regdomain *regd;
819 u32 max_bandwidth = 0; 841 u32 max_bandwidth = 0;
820 842
821 if (!cfg80211_regdomain) 843 regd = custom_regd ? custom_regd : cfg80211_regdomain;
844
845 /*
846 * Follow the driver's regulatory domain, if present, unless a country
847 * IE has been processed or a user wants to help complaince further
848 */
849 if (last_request->initiator != REGDOM_SET_BY_COUNTRY_IE &&
850 last_request->initiator != REGDOM_SET_BY_USER &&
851 wiphy->regd)
852 regd = wiphy->regd;
853
854 if (!regd)
822 return -EINVAL; 855 return -EINVAL;
823 856
824 for (i = 0; i < cfg80211_regdomain->n_reg_rules; i++) { 857 for (i = 0; i < regd->n_reg_rules; i++) {
825 const struct ieee80211_reg_rule *rr; 858 const struct ieee80211_reg_rule *rr;
826 const struct ieee80211_freq_range *fr = NULL; 859 const struct ieee80211_freq_range *fr = NULL;
827 const struct ieee80211_power_rule *pr = NULL; 860 const struct ieee80211_power_rule *pr = NULL;
828 861
829 rr = &cfg80211_regdomain->reg_rules[i]; 862 rr = &regd->reg_rules[i];
830 fr = &rr->freq_range; 863 fr = &rr->freq_range;
831 pr = &rr->power_rule; 864 pr = &rr->power_rule;
832 865
833 /* We only need to know if one frequency rule was 866 /*
867 * We only need to know if one frequency rule was
834 * was in center_freq's band, that's enough, so lets 868 * was in center_freq's band, that's enough, so lets
835 * not overwrite it once found */ 869 * not overwrite it once found
870 */
836 if (!band_rule_found) 871 if (!band_rule_found)
837 band_rule_found = freq_in_rule_band(fr, center_freq); 872 band_rule_found = freq_in_rule_band(fr, center_freq);
838 873
@@ -850,6 +885,14 @@ static int freq_reg_info(u32 center_freq, u32 *bandwidth,
850 885
851 return !max_bandwidth; 886 return !max_bandwidth;
852} 887}
888EXPORT_SYMBOL(freq_reg_info);
889
890int freq_reg_info(struct wiphy *wiphy, u32 center_freq, u32 *bandwidth,
891 const struct ieee80211_reg_rule **reg_rule)
892{
893 return freq_reg_info_regd(wiphy, center_freq,
894 bandwidth, reg_rule, NULL);
895}
853 896
854static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band, 897static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
855 unsigned int chan_idx) 898 unsigned int chan_idx)
@@ -861,6 +904,11 @@ static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
861 const struct ieee80211_power_rule *power_rule = NULL; 904 const struct ieee80211_power_rule *power_rule = NULL;
862 struct ieee80211_supported_band *sband; 905 struct ieee80211_supported_band *sband;
863 struct ieee80211_channel *chan; 906 struct ieee80211_channel *chan;
907 struct wiphy *request_wiphy = NULL;
908
909 assert_cfg80211_lock();
910
911 request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
864 912
865 sband = wiphy->bands[band]; 913 sband = wiphy->bands[band];
866 BUG_ON(chan_idx >= sband->n_channels); 914 BUG_ON(chan_idx >= sband->n_channels);
@@ -868,11 +916,12 @@ static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
868 916
869 flags = chan->orig_flags; 917 flags = chan->orig_flags;
870 918
871 r = freq_reg_info(MHZ_TO_KHZ(chan->center_freq), 919 r = freq_reg_info(wiphy, MHZ_TO_KHZ(chan->center_freq),
872 &max_bandwidth, &reg_rule); 920 &max_bandwidth, &reg_rule);
873 921
874 if (r) { 922 if (r) {
875 /* This means no regulatory rule was found in the country IE 923 /*
924 * This means no regulatory rule was found in the country IE
876 * with a frequency range on the center_freq's band, since 925 * with a frequency range on the center_freq's band, since
877 * IEEE-802.11 allows for a country IE to have a subset of the 926 * IEEE-802.11 allows for a country IE to have a subset of the
878 * regulatory information provided in a country we ignore 927 * regulatory information provided in a country we ignore
@@ -891,8 +940,10 @@ static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
891 chan->center_freq, wiphy_name(wiphy)); 940 chan->center_freq, wiphy_name(wiphy));
892#endif 941#endif
893 } else { 942 } else {
894 /* In this case we know the country IE has at least one reg rule 943 /*
895 * for the band so we respect its band definitions */ 944 * In this case we know the country IE has at least one reg rule
945 * for the band so we respect its band definitions
946 */
896#ifdef CONFIG_CFG80211_REG_DEBUG 947#ifdef CONFIG_CFG80211_REG_DEBUG
897 if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE) 948 if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE)
898 printk(KERN_DEBUG "cfg80211: Disabling " 949 printk(KERN_DEBUG "cfg80211: Disabling "
@@ -908,6 +959,24 @@ static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
908 959
909 power_rule = &reg_rule->power_rule; 960 power_rule = &reg_rule->power_rule;
910 961
962 if (last_request->initiator == REGDOM_SET_BY_DRIVER &&
963 request_wiphy && request_wiphy == wiphy &&
964 request_wiphy->strict_regulatory) {
965 /*
966 * This gaurantees the driver's requested regulatory domain
967 * will always be used as a base for further regulatory
968 * settings
969 */
970 chan->flags = chan->orig_flags =
971 map_regdom_flags(reg_rule->flags);
972 chan->max_antenna_gain = chan->orig_mag =
973 (int) MBI_TO_DBI(power_rule->max_antenna_gain);
974 chan->max_bandwidth = KHZ_TO_MHZ(max_bandwidth);
975 chan->max_power = chan->orig_mpwr =
976 (int) MBM_TO_DBM(power_rule->max_eirp);
977 return;
978 }
979
911 chan->flags = flags | map_regdom_flags(reg_rule->flags); 980 chan->flags = flags | map_regdom_flags(reg_rule->flags);
912 chan->max_antenna_gain = min(chan->orig_mag, 981 chan->max_antenna_gain = min(chan->orig_mag,
913 (int) MBI_TO_DBI(power_rule->max_antenna_gain)); 982 (int) MBI_TO_DBI(power_rule->max_antenna_gain));
@@ -936,7 +1005,14 @@ static bool ignore_reg_update(struct wiphy *wiphy, enum reg_set_by setby)
936 if (!last_request) 1005 if (!last_request)
937 return true; 1006 return true;
938 if (setby == REGDOM_SET_BY_CORE && 1007 if (setby == REGDOM_SET_BY_CORE &&
939 wiphy->fw_handles_regulatory) 1008 wiphy->custom_regulatory)
1009 return true;
1010 /*
1011 * wiphy->regd will be set once the device has its own
1012 * desired regulatory domain set
1013 */
1014 if (wiphy->strict_regulatory && !wiphy->regd &&
1015 !is_world_regdom(last_request->alpha2))
940 return true; 1016 return true;
941 return false; 1017 return false;
942} 1018}
@@ -946,117 +1022,374 @@ static void update_all_wiphy_regulatory(enum reg_set_by setby)
946 struct cfg80211_registered_device *drv; 1022 struct cfg80211_registered_device *drv;
947 1023
948 list_for_each_entry(drv, &cfg80211_drv_list, list) 1024 list_for_each_entry(drv, &cfg80211_drv_list, list)
949 if (!ignore_reg_update(&drv->wiphy, setby)) 1025 wiphy_update_regulatory(&drv->wiphy, setby);
950 wiphy_update_regulatory(&drv->wiphy, setby); 1026}
1027
1028static void handle_reg_beacon(struct wiphy *wiphy,
1029 unsigned int chan_idx,
1030 struct reg_beacon *reg_beacon)
1031{
1032#ifdef CONFIG_CFG80211_REG_DEBUG
1033#define REG_DEBUG_BEACON_FLAG(desc) \
1034 printk(KERN_DEBUG "cfg80211: Enabling " desc " on " \
1035 "frequency: %d MHz (Ch %d) on %s\n", \
1036 reg_beacon->chan.center_freq, \
1037 ieee80211_frequency_to_channel(reg_beacon->chan.center_freq), \
1038 wiphy_name(wiphy));
1039#else
1040#define REG_DEBUG_BEACON_FLAG(desc) do {} while (0)
1041#endif
1042 struct ieee80211_supported_band *sband;
1043 struct ieee80211_channel *chan;
1044
1045 assert_cfg80211_lock();
1046
1047 sband = wiphy->bands[reg_beacon->chan.band];
1048 chan = &sband->channels[chan_idx];
1049
1050 if (likely(chan->center_freq != reg_beacon->chan.center_freq))
1051 return;
1052
1053 if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) {
1054 chan->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
1055 REG_DEBUG_BEACON_FLAG("active scanning");
1056 }
1057
1058 if (chan->flags & IEEE80211_CHAN_NO_IBSS) {
1059 chan->flags &= ~IEEE80211_CHAN_NO_IBSS;
1060 REG_DEBUG_BEACON_FLAG("beaconing");
1061 }
1062
1063 chan->beacon_found = true;
1064#undef REG_DEBUG_BEACON_FLAG
1065}
1066
1067/*
1068 * Called when a scan on a wiphy finds a beacon on
1069 * new channel
1070 */
1071static void wiphy_update_new_beacon(struct wiphy *wiphy,
1072 struct reg_beacon *reg_beacon)
1073{
1074 unsigned int i;
1075 struct ieee80211_supported_band *sband;
1076
1077 assert_cfg80211_lock();
1078
1079 if (!wiphy->bands[reg_beacon->chan.band])
1080 return;
1081
1082 sband = wiphy->bands[reg_beacon->chan.band];
1083
1084 for (i = 0; i < sband->n_channels; i++)
1085 handle_reg_beacon(wiphy, i, reg_beacon);
1086}
1087
1088/*
1089 * Called upon reg changes or a new wiphy is added
1090 */
1091static void wiphy_update_beacon_reg(struct wiphy *wiphy)
1092{
1093 unsigned int i;
1094 struct ieee80211_supported_band *sband;
1095 struct reg_beacon *reg_beacon;
1096
1097 assert_cfg80211_lock();
1098
1099 if (list_empty(&reg_beacon_list))
1100 return;
1101
1102 list_for_each_entry(reg_beacon, &reg_beacon_list, list) {
1103 if (!wiphy->bands[reg_beacon->chan.band])
1104 continue;
1105 sband = wiphy->bands[reg_beacon->chan.band];
1106 for (i = 0; i < sband->n_channels; i++)
1107 handle_reg_beacon(wiphy, i, reg_beacon);
1108 }
1109}
1110
1111static bool reg_is_world_roaming(struct wiphy *wiphy)
1112{
1113 if (is_world_regdom(cfg80211_regdomain->alpha2) ||
1114 (wiphy->regd && is_world_regdom(wiphy->regd->alpha2)))
1115 return true;
1116 if (last_request->initiator != REGDOM_SET_BY_COUNTRY_IE &&
1117 wiphy->custom_regulatory)
1118 return true;
1119 return false;
1120}
1121
1122/* Reap the advantages of previously found beacons */
1123static void reg_process_beacons(struct wiphy *wiphy)
1124{
1125 if (!reg_is_world_roaming(wiphy))
1126 return;
1127 wiphy_update_beacon_reg(wiphy);
951} 1128}
952 1129
953void wiphy_update_regulatory(struct wiphy *wiphy, enum reg_set_by setby) 1130void wiphy_update_regulatory(struct wiphy *wiphy, enum reg_set_by setby)
954{ 1131{
955 enum ieee80211_band band; 1132 enum ieee80211_band band;
1133
1134 if (ignore_reg_update(wiphy, setby))
1135 goto out;
956 for (band = 0; band < IEEE80211_NUM_BANDS; band++) { 1136 for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
957 if (wiphy->bands[band]) 1137 if (wiphy->bands[band])
958 handle_band(wiphy, band); 1138 handle_band(wiphy, band);
959 if (wiphy->reg_notifier)
960 wiphy->reg_notifier(wiphy, setby);
961 } 1139 }
1140out:
1141 reg_process_beacons(wiphy);
1142 if (wiphy->reg_notifier)
1143 wiphy->reg_notifier(wiphy, last_request);
1144}
1145
1146static void handle_channel_custom(struct wiphy *wiphy,
1147 enum ieee80211_band band,
1148 unsigned int chan_idx,
1149 const struct ieee80211_regdomain *regd)
1150{
1151 int r;
1152 u32 max_bandwidth = 0;
1153 const struct ieee80211_reg_rule *reg_rule = NULL;
1154 const struct ieee80211_power_rule *power_rule = NULL;
1155 struct ieee80211_supported_band *sband;
1156 struct ieee80211_channel *chan;
1157
1158 sband = wiphy->bands[band];
1159 BUG_ON(chan_idx >= sband->n_channels);
1160 chan = &sband->channels[chan_idx];
1161
1162 r = freq_reg_info_regd(wiphy, MHZ_TO_KHZ(chan->center_freq),
1163 &max_bandwidth, &reg_rule, regd);
1164
1165 if (r) {
1166 chan->flags = IEEE80211_CHAN_DISABLED;
1167 return;
1168 }
1169
1170 power_rule = &reg_rule->power_rule;
1171
1172 chan->flags |= map_regdom_flags(reg_rule->flags);
1173 chan->max_antenna_gain = (int) MBI_TO_DBI(power_rule->max_antenna_gain);
1174 chan->max_bandwidth = KHZ_TO_MHZ(max_bandwidth);
1175 chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp);
962} 1176}
963 1177
964/* Return value which can be used by ignore_request() to indicate 1178static void handle_band_custom(struct wiphy *wiphy, enum ieee80211_band band,
965 * it has been determined we should intersect two regulatory domains */ 1179 const struct ieee80211_regdomain *regd)
1180{
1181 unsigned int i;
1182 struct ieee80211_supported_band *sband;
1183
1184 BUG_ON(!wiphy->bands[band]);
1185 sband = wiphy->bands[band];
1186
1187 for (i = 0; i < sband->n_channels; i++)
1188 handle_channel_custom(wiphy, band, i, regd);
1189}
1190
1191/* Used by drivers prior to wiphy registration */
1192void wiphy_apply_custom_regulatory(struct wiphy *wiphy,
1193 const struct ieee80211_regdomain *regd)
1194{
1195 enum ieee80211_band band;
1196 for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
1197 if (wiphy->bands[band])
1198 handle_band_custom(wiphy, band, regd);
1199 }
1200}
1201EXPORT_SYMBOL(wiphy_apply_custom_regulatory);
1202
1203static int reg_copy_regd(const struct ieee80211_regdomain **dst_regd,
1204 const struct ieee80211_regdomain *src_regd)
1205{
1206 struct ieee80211_regdomain *regd;
1207 int size_of_regd = 0;
1208 unsigned int i;
1209
1210 size_of_regd = sizeof(struct ieee80211_regdomain) +
1211 ((src_regd->n_reg_rules + 1) * sizeof(struct ieee80211_reg_rule));
1212
1213 regd = kzalloc(size_of_regd, GFP_KERNEL);
1214 if (!regd)
1215 return -ENOMEM;
1216
1217 memcpy(regd, src_regd, sizeof(struct ieee80211_regdomain));
1218
1219 for (i = 0; i < src_regd->n_reg_rules; i++)
1220 memcpy(&regd->reg_rules[i], &src_regd->reg_rules[i],
1221 sizeof(struct ieee80211_reg_rule));
1222
1223 *dst_regd = regd;
1224 return 0;
1225}
1226
1227/*
1228 * Return value which can be used by ignore_request() to indicate
1229 * it has been determined we should intersect two regulatory domains
1230 */
966#define REG_INTERSECT 1 1231#define REG_INTERSECT 1
967 1232
968/* This has the logic which determines when a new request 1233/* This has the logic which determines when a new request
969 * should be ignored. */ 1234 * should be ignored. */
970static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by, 1235static int ignore_request(struct wiphy *wiphy,
971 const char *alpha2) 1236 struct regulatory_request *pending_request)
972{ 1237{
1238 struct wiphy *last_wiphy = NULL;
1239
1240 assert_cfg80211_lock();
1241
973 /* All initial requests are respected */ 1242 /* All initial requests are respected */
974 if (!last_request) 1243 if (!last_request)
975 return 0; 1244 return 0;
976 1245
977 switch (set_by) { 1246 switch (pending_request->initiator) {
978 case REGDOM_SET_BY_INIT: 1247 case REGDOM_SET_BY_INIT:
979 return -EINVAL; 1248 return -EINVAL;
980 case REGDOM_SET_BY_CORE: 1249 case REGDOM_SET_BY_CORE:
981 /* 1250 return -EINVAL;
982 * Always respect new wireless core hints, should only happen
983 * when updating the world regulatory domain at init.
984 */
985 return 0;
986 case REGDOM_SET_BY_COUNTRY_IE: 1251 case REGDOM_SET_BY_COUNTRY_IE:
987 if (unlikely(!is_an_alpha2(alpha2))) 1252
1253 last_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
1254
1255 if (unlikely(!is_an_alpha2(pending_request->alpha2)))
988 return -EINVAL; 1256 return -EINVAL;
989 if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE) { 1257 if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE) {
990 if (last_request->wiphy != wiphy) { 1258 if (last_wiphy != wiphy) {
991 /* 1259 /*
992 * Two cards with two APs claiming different 1260 * Two cards with two APs claiming different
993 * different Country IE alpha2s. We could 1261 * different Country IE alpha2s. We could
994 * intersect them, but that seems unlikely 1262 * intersect them, but that seems unlikely
995 * to be correct. Reject second one for now. 1263 * to be correct. Reject second one for now.
996 */ 1264 */
997 if (!alpha2_equal(alpha2, 1265 if (regdom_changes(pending_request->alpha2))
998 cfg80211_regdomain->alpha2))
999 return -EOPNOTSUPP; 1266 return -EOPNOTSUPP;
1000 return -EALREADY; 1267 return -EALREADY;
1001 } 1268 }
1002 /* Two consecutive Country IE hints on the same wiphy. 1269 /*
1003 * This should be picked up early by the driver/stack */ 1270 * Two consecutive Country IE hints on the same wiphy.
1004 if (WARN_ON(!alpha2_equal(cfg80211_regdomain->alpha2, 1271 * This should be picked up early by the driver/stack
1005 alpha2))) 1272 */
1273 if (WARN_ON(regdom_changes(pending_request->alpha2)))
1006 return 0; 1274 return 0;
1007 return -EALREADY; 1275 return -EALREADY;
1008 } 1276 }
1009 return REG_INTERSECT; 1277 return REG_INTERSECT;
1010 case REGDOM_SET_BY_DRIVER: 1278 case REGDOM_SET_BY_DRIVER:
1011 if (last_request->initiator == REGDOM_SET_BY_DRIVER) 1279 if (last_request->initiator == REGDOM_SET_BY_CORE) {
1280 if (is_old_static_regdom(cfg80211_regdomain))
1281 return 0;
1282 if (regdom_changes(pending_request->alpha2))
1283 return 0;
1012 return -EALREADY; 1284 return -EALREADY;
1013 return 0; 1285 }
1286
1287 /*
1288 * This would happen if you unplug and plug your card
1289 * back in or if you add a new device for which the previously
1290 * loaded card also agrees on the regulatory domain.
1291 */
1292 if (last_request->initiator == REGDOM_SET_BY_DRIVER &&
1293 !regdom_changes(pending_request->alpha2))
1294 return -EALREADY;
1295
1296 return REG_INTERSECT;
1014 case REGDOM_SET_BY_USER: 1297 case REGDOM_SET_BY_USER:
1015 if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE) 1298 if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE)
1016 return REG_INTERSECT; 1299 return REG_INTERSECT;
1017 /* If the user knows better the user should set the regdom 1300 /*
1018 * to their country before the IE is picked up */ 1301 * If the user knows better the user should set the regdom
1302 * to their country before the IE is picked up
1303 */
1019 if (last_request->initiator == REGDOM_SET_BY_USER && 1304 if (last_request->initiator == REGDOM_SET_BY_USER &&
1020 last_request->intersect) 1305 last_request->intersect)
1021 return -EOPNOTSUPP; 1306 return -EOPNOTSUPP;
1307 /*
1308 * Process user requests only after previous user/driver/core
1309 * requests have been processed
1310 */
1311 if (last_request->initiator == REGDOM_SET_BY_CORE ||
1312 last_request->initiator == REGDOM_SET_BY_DRIVER ||
1313 last_request->initiator == REGDOM_SET_BY_USER) {
1314 if (regdom_changes(last_request->alpha2))
1315 return -EAGAIN;
1316 }
1317
1318 if (!is_old_static_regdom(cfg80211_regdomain) &&
1319 !regdom_changes(pending_request->alpha2))
1320 return -EALREADY;
1321
1022 return 0; 1322 return 0;
1023 } 1323 }
1024 1324
1025 return -EINVAL; 1325 return -EINVAL;
1026} 1326}
1027 1327
1028/* Caller must hold &cfg80211_drv_mutex */ 1328/**
1029int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by, 1329 * __regulatory_hint - hint to the wireless core a regulatory domain
1030 const char *alpha2, 1330 * @wiphy: if the hint comes from country information from an AP, this
1031 u32 country_ie_checksum, 1331 * is required to be set to the wiphy that received the information
1032 enum environment_cap env) 1332 * @pending_request: the regulatory request currently being processed
1333 *
1334 * The Wireless subsystem can use this function to hint to the wireless core
1335 * what it believes should be the current regulatory domain.
1336 *
1337 * Returns zero if all went fine, %-EALREADY if a regulatory domain had
1338 * already been set or other standard error codes.
1339 *
1340 * Caller must hold &cfg80211_mutex
1341 */
1342static int __regulatory_hint(struct wiphy *wiphy,
1343 struct regulatory_request *pending_request)
1033{ 1344{
1034 struct regulatory_request *request;
1035 bool intersect = false; 1345 bool intersect = false;
1036 int r = 0; 1346 int r = 0;
1037 1347
1038 r = ignore_request(wiphy, set_by, alpha2); 1348 assert_cfg80211_lock();
1349
1350 r = ignore_request(wiphy, pending_request);
1039 1351
1040 if (r == REG_INTERSECT) 1352 if (r == REG_INTERSECT) {
1353 if (pending_request->initiator == REGDOM_SET_BY_DRIVER) {
1354 r = reg_copy_regd(&wiphy->regd, cfg80211_regdomain);
1355 if (r) {
1356 kfree(pending_request);
1357 return r;
1358 }
1359 }
1041 intersect = true; 1360 intersect = true;
1042 else if (r) 1361 } else if (r) {
1362 /*
1363 * If the regulatory domain being requested by the
1364 * driver has already been set just copy it to the
1365 * wiphy
1366 */
1367 if (r == -EALREADY &&
1368 pending_request->initiator == REGDOM_SET_BY_DRIVER) {
1369 r = reg_copy_regd(&wiphy->regd, cfg80211_regdomain);
1370 if (r) {
1371 kfree(pending_request);
1372 return r;
1373 }
1374 r = -EALREADY;
1375 goto new_request;
1376 }
1377 kfree(pending_request);
1043 return r; 1378 return r;
1379 }
1044 1380
1045 request = kzalloc(sizeof(struct regulatory_request), 1381new_request:
1046 GFP_KERNEL); 1382 kfree(last_request);
1047 if (!request)
1048 return -ENOMEM;
1049 1383
1050 request->alpha2[0] = alpha2[0]; 1384 last_request = pending_request;
1051 request->alpha2[1] = alpha2[1]; 1385 last_request->intersect = intersect;
1052 request->initiator = set_by; 1386
1053 request->wiphy = wiphy; 1387 pending_request = NULL;
1054 request->intersect = intersect; 1388
1055 request->country_ie_checksum = country_ie_checksum; 1389 /* When r == REG_INTERSECT we do need to call CRDA */
1056 request->country_ie_env = env; 1390 if (r < 0)
1391 return r;
1057 1392
1058 kfree(last_request);
1059 last_request = request;
1060 /* 1393 /*
1061 * Note: When CONFIG_WIRELESS_OLD_REGULATORY is enabled 1394 * Note: When CONFIG_WIRELESS_OLD_REGULATORY is enabled
1062 * AND if CRDA is NOT present nothing will happen, if someone 1395 * AND if CRDA is NOT present nothing will happen, if someone
@@ -1067,29 +1400,194 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
1067 * 1400 *
1068 * to intersect with the static rd 1401 * to intersect with the static rd
1069 */ 1402 */
1070 return call_crda(alpha2); 1403 return call_crda(last_request->alpha2);
1071} 1404}
1072 1405
1073void regulatory_hint(struct wiphy *wiphy, const char *alpha2) 1406/* This currently only processes user and driver regulatory hints */
1407static void reg_process_hint(struct regulatory_request *reg_request)
1074{ 1408{
1409 int r = 0;
1410 struct wiphy *wiphy = NULL;
1411
1412 BUG_ON(!reg_request->alpha2);
1413
1414 mutex_lock(&cfg80211_mutex);
1415
1416 if (wiphy_idx_valid(reg_request->wiphy_idx))
1417 wiphy = wiphy_idx_to_wiphy(reg_request->wiphy_idx);
1418
1419 if (reg_request->initiator == REGDOM_SET_BY_DRIVER &&
1420 !wiphy) {
1421 kfree(reg_request);
1422 goto out;
1423 }
1424
1425 r = __regulatory_hint(wiphy, reg_request);
1426 /* This is required so that the orig_* parameters are saved */
1427 if (r == -EALREADY && wiphy && wiphy->strict_regulatory)
1428 wiphy_update_regulatory(wiphy, reg_request->initiator);
1429out:
1430 mutex_unlock(&cfg80211_mutex);
1431}
1432
1433/* Processes regulatory hints, this is all the REGDOM_SET_BY_* */
1434static void reg_process_pending_hints(void)
1435 {
1436 struct regulatory_request *reg_request;
1437
1438 spin_lock(&reg_requests_lock);
1439 while (!list_empty(&reg_requests_list)) {
1440 reg_request = list_first_entry(&reg_requests_list,
1441 struct regulatory_request,
1442 list);
1443 list_del_init(&reg_request->list);
1444
1445 spin_unlock(&reg_requests_lock);
1446 reg_process_hint(reg_request);
1447 spin_lock(&reg_requests_lock);
1448 }
1449 spin_unlock(&reg_requests_lock);
1450}
1451
1452/* Processes beacon hints -- this has nothing to do with country IEs */
1453static void reg_process_pending_beacon_hints(void)
1454{
1455 struct cfg80211_registered_device *drv;
1456 struct reg_beacon *pending_beacon, *tmp;
1457
1458 mutex_lock(&cfg80211_mutex);
1459
1460 /* This goes through the _pending_ beacon list */
1461 spin_lock_bh(&reg_pending_beacons_lock);
1462
1463 if (list_empty(&reg_pending_beacons)) {
1464 spin_unlock_bh(&reg_pending_beacons_lock);
1465 goto out;
1466 }
1467
1468 list_for_each_entry_safe(pending_beacon, tmp,
1469 &reg_pending_beacons, list) {
1470
1471 list_del_init(&pending_beacon->list);
1472
1473 /* Applies the beacon hint to current wiphys */
1474 list_for_each_entry(drv, &cfg80211_drv_list, list)
1475 wiphy_update_new_beacon(&drv->wiphy, pending_beacon);
1476
1477 /* Remembers the beacon hint for new wiphys or reg changes */
1478 list_add_tail(&pending_beacon->list, &reg_beacon_list);
1479 }
1480
1481 spin_unlock_bh(&reg_pending_beacons_lock);
1482out:
1483 mutex_unlock(&cfg80211_mutex);
1484}
1485
1486static void reg_todo(struct work_struct *work)
1487{
1488 reg_process_pending_hints();
1489 reg_process_pending_beacon_hints();
1490}
1491
1492static DECLARE_WORK(reg_work, reg_todo);
1493
1494static void queue_regulatory_request(struct regulatory_request *request)
1495{
1496 spin_lock(&reg_requests_lock);
1497 list_add_tail(&request->list, &reg_requests_list);
1498 spin_unlock(&reg_requests_lock);
1499
1500 schedule_work(&reg_work);
1501}
1502
1503/* Core regulatory hint -- happens once during cfg80211_init() */
1504static int regulatory_hint_core(const char *alpha2)
1505{
1506 struct regulatory_request *request;
1507
1508 BUG_ON(last_request);
1509
1510 request = kzalloc(sizeof(struct regulatory_request),
1511 GFP_KERNEL);
1512 if (!request)
1513 return -ENOMEM;
1514
1515 request->alpha2[0] = alpha2[0];
1516 request->alpha2[1] = alpha2[1];
1517 request->initiator = REGDOM_SET_BY_CORE;
1518
1519 queue_regulatory_request(request);
1520
1521 return 0;
1522}
1523
1524/* User hints */
1525int regulatory_hint_user(const char *alpha2)
1526{
1527 struct regulatory_request *request;
1528
1529 BUG_ON(!alpha2);
1530
1531 request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL);
1532 if (!request)
1533 return -ENOMEM;
1534
1535 request->wiphy_idx = WIPHY_IDX_STALE;
1536 request->alpha2[0] = alpha2[0];
1537 request->alpha2[1] = alpha2[1];
1538 request->initiator = REGDOM_SET_BY_USER,
1539
1540 queue_regulatory_request(request);
1541
1542 return 0;
1543}
1544
1545/* Driver hints */
1546int regulatory_hint(struct wiphy *wiphy, const char *alpha2)
1547{
1548 struct regulatory_request *request;
1549
1075 BUG_ON(!alpha2); 1550 BUG_ON(!alpha2);
1551 BUG_ON(!wiphy);
1552
1553 request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL);
1554 if (!request)
1555 return -ENOMEM;
1556
1557 request->wiphy_idx = get_wiphy_idx(wiphy);
1076 1558
1077 mutex_lock(&cfg80211_drv_mutex); 1559 /* Must have registered wiphy first */
1078 __regulatory_hint(wiphy, REGDOM_SET_BY_DRIVER, alpha2, 0, ENVIRON_ANY); 1560 BUG_ON(!wiphy_idx_valid(request->wiphy_idx));
1079 mutex_unlock(&cfg80211_drv_mutex); 1561
1562 request->alpha2[0] = alpha2[0];
1563 request->alpha2[1] = alpha2[1];
1564 request->initiator = REGDOM_SET_BY_DRIVER;
1565
1566 queue_regulatory_request(request);
1567
1568 return 0;
1080} 1569}
1081EXPORT_SYMBOL(regulatory_hint); 1570EXPORT_SYMBOL(regulatory_hint);
1082 1571
1083static bool reg_same_country_ie_hint(struct wiphy *wiphy, 1572static bool reg_same_country_ie_hint(struct wiphy *wiphy,
1084 u32 country_ie_checksum) 1573 u32 country_ie_checksum)
1085{ 1574{
1086 if (!last_request->wiphy) 1575 struct wiphy *request_wiphy;
1576
1577 assert_cfg80211_lock();
1578
1579 request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
1580
1581 if (!request_wiphy)
1087 return false; 1582 return false;
1088 if (likely(last_request->wiphy != wiphy)) 1583
1584 if (likely(request_wiphy != wiphy))
1089 return !country_ie_integrity_changes(country_ie_checksum); 1585 return !country_ie_integrity_changes(country_ie_checksum);
1090 /* We should not have let these through at this point, they 1586 /*
1587 * We should not have let these through at this point, they
1091 * should have been picked up earlier by the first alpha2 check 1588 * should have been picked up earlier by the first alpha2 check
1092 * on the device */ 1589 * on the device
1590 */
1093 if (WARN_ON(!country_ie_integrity_changes(country_ie_checksum))) 1591 if (WARN_ON(!country_ie_integrity_changes(country_ie_checksum)))
1094 return true; 1592 return true;
1095 return false; 1593 return false;
@@ -1103,11 +1601,14 @@ void regulatory_hint_11d(struct wiphy *wiphy,
1103 char alpha2[2]; 1601 char alpha2[2];
1104 u32 checksum = 0; 1602 u32 checksum = 0;
1105 enum environment_cap env = ENVIRON_ANY; 1603 enum environment_cap env = ENVIRON_ANY;
1604 struct regulatory_request *request;
1106 1605
1107 if (!last_request) 1606 mutex_lock(&cfg80211_mutex);
1108 return;
1109 1607
1110 mutex_lock(&cfg80211_drv_mutex); 1608 if (unlikely(!last_request)) {
1609 mutex_unlock(&cfg80211_mutex);
1610 return;
1611 }
1111 1612
1112 /* IE len must be evenly divisible by 2 */ 1613 /* IE len must be evenly divisible by 2 */
1113 if (country_ie_len & 0x01) 1614 if (country_ie_len & 0x01)
@@ -1116,9 +1617,11 @@ void regulatory_hint_11d(struct wiphy *wiphy,
1116 if (country_ie_len < IEEE80211_COUNTRY_IE_MIN_LEN) 1617 if (country_ie_len < IEEE80211_COUNTRY_IE_MIN_LEN)
1117 goto out; 1618 goto out;
1118 1619
1119 /* Pending country IE processing, this can happen after we 1620 /*
1621 * Pending country IE processing, this can happen after we
1120 * call CRDA and wait for a response if a beacon was received before 1622 * call CRDA and wait for a response if a beacon was received before
1121 * we were able to process the last regulatory_hint_11d() call */ 1623 * we were able to process the last regulatory_hint_11d() call
1624 */
1122 if (country_ie_regdomain) 1625 if (country_ie_regdomain)
1123 goto out; 1626 goto out;
1124 1627
@@ -1130,33 +1633,44 @@ void regulatory_hint_11d(struct wiphy *wiphy,
1130 else if (country_ie[2] == 'O') 1633 else if (country_ie[2] == 'O')
1131 env = ENVIRON_OUTDOOR; 1634 env = ENVIRON_OUTDOOR;
1132 1635
1133 /* We will run this for *every* beacon processed for the BSSID, so 1636 /*
1637 * We will run this for *every* beacon processed for the BSSID, so
1134 * we optimize an early check to exit out early if we don't have to 1638 * we optimize an early check to exit out early if we don't have to
1135 * do anything */ 1639 * do anything
1136 if (likely(last_request->wiphy)) { 1640 */
1641 if (likely(wiphy_idx_valid(last_request->wiphy_idx))) {
1137 struct cfg80211_registered_device *drv_last_ie; 1642 struct cfg80211_registered_device *drv_last_ie;
1138 1643
1139 drv_last_ie = wiphy_to_dev(last_request->wiphy); 1644 drv_last_ie =
1645 cfg80211_drv_by_wiphy_idx(last_request->wiphy_idx);
1140 1646
1141 /* Lets keep this simple -- we trust the first AP 1647 /*
1142 * after we intersect with CRDA */ 1648 * Lets keep this simple -- we trust the first AP
1143 if (likely(last_request->wiphy == wiphy)) { 1649 * after we intersect with CRDA
1144 /* Ignore IEs coming in on this wiphy with 1650 */
1145 * the same alpha2 and environment cap */ 1651 if (likely(&drv_last_ie->wiphy == wiphy)) {
1652 /*
1653 * Ignore IEs coming in on this wiphy with
1654 * the same alpha2 and environment cap
1655 */
1146 if (likely(alpha2_equal(drv_last_ie->country_ie_alpha2, 1656 if (likely(alpha2_equal(drv_last_ie->country_ie_alpha2,
1147 alpha2) && 1657 alpha2) &&
1148 env == drv_last_ie->env)) { 1658 env == drv_last_ie->env)) {
1149 goto out; 1659 goto out;
1150 } 1660 }
1151 /* the wiphy moved on to another BSSID or the AP 1661 /*
1662 * the wiphy moved on to another BSSID or the AP
1152 * was reconfigured. XXX: We need to deal with the 1663 * was reconfigured. XXX: We need to deal with the
1153 * case where the user suspends and goes to goes 1664 * case where the user suspends and goes to goes
1154 * to another country, and then gets IEs from an 1665 * to another country, and then gets IEs from an
1155 * AP with different settings */ 1666 * AP with different settings
1667 */
1156 goto out; 1668 goto out;
1157 } else { 1669 } else {
1158 /* Ignore IEs coming in on two separate wiphys with 1670 /*
1159 * the same alpha2 and environment cap */ 1671 * Ignore IEs coming in on two separate wiphys with
1672 * the same alpha2 and environment cap
1673 */
1160 if (likely(alpha2_equal(drv_last_ie->country_ie_alpha2, 1674 if (likely(alpha2_equal(drv_last_ie->country_ie_alpha2,
1161 alpha2) && 1675 alpha2) &&
1162 env == drv_last_ie->env)) { 1676 env == drv_last_ie->env)) {
@@ -1171,28 +1685,97 @@ void regulatory_hint_11d(struct wiphy *wiphy,
1171 if (!rd) 1685 if (!rd)
1172 goto out; 1686 goto out;
1173 1687
1174 /* This will not happen right now but we leave it here for the 1688 /*
1689 * This will not happen right now but we leave it here for the
1175 * the future when we want to add suspend/resume support and having 1690 * the future when we want to add suspend/resume support and having
1176 * the user move to another country after doing so, or having the user 1691 * the user move to another country after doing so, or having the user
1177 * move to another AP. Right now we just trust the first AP. This is why 1692 * move to another AP. Right now we just trust the first AP.
1178 * this is marked as likley(). If we hit this before we add this support 1693 *
1179 * we want to be informed of it as it would indicate a mistake in the 1694 * If we hit this before we add this support we want to be informed of
1180 * current design */ 1695 * it as it would indicate a mistake in the current design
1181 if (likely(WARN_ON(reg_same_country_ie_hint(wiphy, checksum)))) 1696 */
1182 goto out; 1697 if (WARN_ON(reg_same_country_ie_hint(wiphy, checksum)))
1698 goto free_rd_out;
1699
1700 request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL);
1701 if (!request)
1702 goto free_rd_out;
1183 1703
1184 /* We keep this around for when CRDA comes back with a response so 1704 /*
1185 * we can intersect with that */ 1705 * We keep this around for when CRDA comes back with a response so
1706 * we can intersect with that
1707 */
1186 country_ie_regdomain = rd; 1708 country_ie_regdomain = rd;
1187 1709
1188 __regulatory_hint(wiphy, REGDOM_SET_BY_COUNTRY_IE, 1710 request->wiphy_idx = get_wiphy_idx(wiphy);
1189 country_ie_regdomain->alpha2, checksum, env); 1711 request->alpha2[0] = rd->alpha2[0];
1712 request->alpha2[1] = rd->alpha2[1];
1713 request->initiator = REGDOM_SET_BY_COUNTRY_IE;
1714 request->country_ie_checksum = checksum;
1715 request->country_ie_env = env;
1716
1717 mutex_unlock(&cfg80211_mutex);
1190 1718
1719 queue_regulatory_request(request);
1720
1721 return;
1722
1723free_rd_out:
1724 kfree(rd);
1191out: 1725out:
1192 mutex_unlock(&cfg80211_drv_mutex); 1726 mutex_unlock(&cfg80211_mutex);
1193} 1727}
1194EXPORT_SYMBOL(regulatory_hint_11d); 1728EXPORT_SYMBOL(regulatory_hint_11d);
1195 1729
1730static bool freq_is_chan_12_13_14(u16 freq)
1731{
1732 if (freq == ieee80211_channel_to_frequency(12) ||
1733 freq == ieee80211_channel_to_frequency(13) ||
1734 freq == ieee80211_channel_to_frequency(14))
1735 return true;
1736 return false;
1737}
1738
1739int regulatory_hint_found_beacon(struct wiphy *wiphy,
1740 struct ieee80211_channel *beacon_chan,
1741 gfp_t gfp)
1742{
1743 struct reg_beacon *reg_beacon;
1744
1745 if (likely((beacon_chan->beacon_found ||
1746 (beacon_chan->flags & IEEE80211_CHAN_RADAR) ||
1747 (beacon_chan->band == IEEE80211_BAND_2GHZ &&
1748 !freq_is_chan_12_13_14(beacon_chan->center_freq)))))
1749 return 0;
1750
1751 reg_beacon = kzalloc(sizeof(struct reg_beacon), gfp);
1752 if (!reg_beacon)
1753 return -ENOMEM;
1754
1755#ifdef CONFIG_CFG80211_REG_DEBUG
1756 printk(KERN_DEBUG "cfg80211: Found new beacon on "
1757 "frequency: %d MHz (Ch %d) on %s\n",
1758 beacon_chan->center_freq,
1759 ieee80211_frequency_to_channel(beacon_chan->center_freq),
1760 wiphy_name(wiphy));
1761#endif
1762 memcpy(&reg_beacon->chan, beacon_chan,
1763 sizeof(struct ieee80211_channel));
1764
1765
1766 /*
1767 * Since we can be called from BH or and non-BH context
1768 * we must use spin_lock_bh()
1769 */
1770 spin_lock_bh(&reg_pending_beacons_lock);
1771 list_add_tail(&reg_beacon->list, &reg_pending_beacons);
1772 spin_unlock_bh(&reg_pending_beacons_lock);
1773
1774 schedule_work(&reg_work);
1775
1776 return 0;
1777}
1778
1196static void print_rd_rules(const struct ieee80211_regdomain *rd) 1779static void print_rd_rules(const struct ieee80211_regdomain *rd)
1197{ 1780{
1198 unsigned int i; 1781 unsigned int i;
@@ -1208,8 +1791,10 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd)
1208 freq_range = &reg_rule->freq_range; 1791 freq_range = &reg_rule->freq_range;
1209 power_rule = &reg_rule->power_rule; 1792 power_rule = &reg_rule->power_rule;
1210 1793
1211 /* There may not be documentation for max antenna gain 1794 /*
1212 * in certain regions */ 1795 * There may not be documentation for max antenna gain
1796 * in certain regions
1797 */
1213 if (power_rule->max_antenna_gain) 1798 if (power_rule->max_antenna_gain)
1214 printk(KERN_INFO "\t(%d KHz - %d KHz @ %d KHz), " 1799 printk(KERN_INFO "\t(%d KHz - %d KHz @ %d KHz), "
1215 "(%d mBi, %d mBm)\n", 1800 "(%d mBi, %d mBm)\n",
@@ -1232,13 +1817,12 @@ static void print_regdomain(const struct ieee80211_regdomain *rd)
1232{ 1817{
1233 1818
1234 if (is_intersected_alpha2(rd->alpha2)) { 1819 if (is_intersected_alpha2(rd->alpha2)) {
1235 struct wiphy *wiphy = NULL;
1236 struct cfg80211_registered_device *drv;
1237 1820
1238 if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE) { 1821 if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE) {
1239 if (last_request->wiphy) { 1822 struct cfg80211_registered_device *drv;
1240 wiphy = last_request->wiphy; 1823 drv = cfg80211_drv_by_wiphy_idx(
1241 drv = wiphy_to_dev(wiphy); 1824 last_request->wiphy_idx);
1825 if (drv) {
1242 printk(KERN_INFO "cfg80211: Current regulatory " 1826 printk(KERN_INFO "cfg80211: Current regulatory "
1243 "domain updated by AP to: %c%c\n", 1827 "domain updated by AP to: %c%c\n",
1244 drv->country_ie_alpha2[0], 1828 drv->country_ie_alpha2[0],
@@ -1248,7 +1832,7 @@ static void print_regdomain(const struct ieee80211_regdomain *rd)
1248 "domain intersected: \n"); 1832 "domain intersected: \n");
1249 } else 1833 } else
1250 printk(KERN_INFO "cfg80211: Current regulatory " 1834 printk(KERN_INFO "cfg80211: Current regulatory "
1251 "intersected: \n"); 1835 "domain intersected: \n");
1252 } else if (is_world_regdom(rd->alpha2)) 1836 } else if (is_world_regdom(rd->alpha2))
1253 printk(KERN_INFO "cfg80211: World regulatory " 1837 printk(KERN_INFO "cfg80211: World regulatory "
1254 "domain updated:\n"); 1838 "domain updated:\n");
@@ -1304,7 +1888,7 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
1304{ 1888{
1305 const struct ieee80211_regdomain *intersected_rd = NULL; 1889 const struct ieee80211_regdomain *intersected_rd = NULL;
1306 struct cfg80211_registered_device *drv = NULL; 1890 struct cfg80211_registered_device *drv = NULL;
1307 struct wiphy *wiphy = NULL; 1891 struct wiphy *request_wiphy;
1308 /* Some basic sanity checks first */ 1892 /* Some basic sanity checks first */
1309 1893
1310 if (is_world_regdom(rd->alpha2)) { 1894 if (is_world_regdom(rd->alpha2)) {
@@ -1321,23 +1905,27 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
1321 if (!last_request) 1905 if (!last_request)
1322 return -EINVAL; 1906 return -EINVAL;
1323 1907
1324 /* Lets only bother proceeding on the same alpha2 if the current 1908 /*
1909 * Lets only bother proceeding on the same alpha2 if the current
1325 * rd is non static (it means CRDA was present and was used last) 1910 * rd is non static (it means CRDA was present and was used last)
1326 * and the pending request came in from a country IE */ 1911 * and the pending request came in from a country IE
1912 */
1327 if (last_request->initiator != REGDOM_SET_BY_COUNTRY_IE) { 1913 if (last_request->initiator != REGDOM_SET_BY_COUNTRY_IE) {
1328 /* If someone else asked us to change the rd lets only bother 1914 /*
1329 * checking if the alpha2 changes if CRDA was already called */ 1915 * If someone else asked us to change the rd lets only bother
1916 * checking if the alpha2 changes if CRDA was already called
1917 */
1330 if (!is_old_static_regdom(cfg80211_regdomain) && 1918 if (!is_old_static_regdom(cfg80211_regdomain) &&
1331 !regdom_changed(rd->alpha2)) 1919 !regdom_changes(rd->alpha2))
1332 return -EINVAL; 1920 return -EINVAL;
1333 } 1921 }
1334 1922
1335 wiphy = last_request->wiphy; 1923 /*
1336 1924 * Now lets set the regulatory domain, update all driver channels
1337 /* Now lets set the regulatory domain, update all driver channels
1338 * and finally inform them of what we have done, in case they want 1925 * and finally inform them of what we have done, in case they want
1339 * to review or adjust their own settings based on their own 1926 * to review or adjust their own settings based on their own
1340 * internal EEPROM data */ 1927 * internal EEPROM data
1928 */
1341 1929
1342 if (WARN_ON(!reg_is_valid_request(rd->alpha2))) 1930 if (WARN_ON(!reg_is_valid_request(rd->alpha2)))
1343 return -EINVAL; 1931 return -EINVAL;
@@ -1349,7 +1937,28 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
1349 return -EINVAL; 1937 return -EINVAL;
1350 } 1938 }
1351 1939
1940 request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
1941
1352 if (!last_request->intersect) { 1942 if (!last_request->intersect) {
1943 int r;
1944
1945 if (last_request->initiator != REGDOM_SET_BY_DRIVER) {
1946 reset_regdomains();
1947 cfg80211_regdomain = rd;
1948 return 0;
1949 }
1950
1951 /*
1952 * For a driver hint, lets copy the regulatory domain the
1953 * driver wanted to the wiphy to deal with conflicts
1954 */
1955
1956 BUG_ON(request_wiphy->regd);
1957
1958 r = reg_copy_regd(&request_wiphy->regd, rd);
1959 if (r)
1960 return r;
1961
1353 reset_regdomains(); 1962 reset_regdomains();
1354 cfg80211_regdomain = rd; 1963 cfg80211_regdomain = rd;
1355 return 0; 1964 return 0;
@@ -1363,8 +1972,16 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
1363 if (!intersected_rd) 1972 if (!intersected_rd)
1364 return -EINVAL; 1973 return -EINVAL;
1365 1974
1366 /* We can trash what CRDA provided now */ 1975 /*
1367 kfree(rd); 1976 * We can trash what CRDA provided now.
1977 * However if a driver requested this specific regulatory
1978 * domain we keep it for its private use
1979 */
1980 if (last_request->initiator == REGDOM_SET_BY_DRIVER)
1981 request_wiphy->regd = rd;
1982 else
1983 kfree(rd);
1984
1368 rd = NULL; 1985 rd = NULL;
1369 1986
1370 reset_regdomains(); 1987 reset_regdomains();
@@ -1381,8 +1998,10 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
1381 BUG_ON(!country_ie_regdomain); 1998 BUG_ON(!country_ie_regdomain);
1382 1999
1383 if (rd != country_ie_regdomain) { 2000 if (rd != country_ie_regdomain) {
1384 /* Intersect what CRDA returned and our what we 2001 /*
1385 * had built from the Country IE received */ 2002 * Intersect what CRDA returned and our what we
2003 * had built from the Country IE received
2004 */
1386 2005
1387 intersected_rd = regdom_intersect(rd, country_ie_regdomain); 2006 intersected_rd = regdom_intersect(rd, country_ie_regdomain);
1388 2007
@@ -1392,16 +2011,18 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
1392 kfree(country_ie_regdomain); 2011 kfree(country_ie_regdomain);
1393 country_ie_regdomain = NULL; 2012 country_ie_regdomain = NULL;
1394 } else { 2013 } else {
1395 /* This would happen when CRDA was not present and 2014 /*
2015 * This would happen when CRDA was not present and
1396 * OLD_REGULATORY was enabled. We intersect our Country 2016 * OLD_REGULATORY was enabled. We intersect our Country
1397 * IE rd and what was set on cfg80211 originally */ 2017 * IE rd and what was set on cfg80211 originally
2018 */
1398 intersected_rd = regdom_intersect(rd, cfg80211_regdomain); 2019 intersected_rd = regdom_intersect(rd, cfg80211_regdomain);
1399 } 2020 }
1400 2021
1401 if (!intersected_rd) 2022 if (!intersected_rd)
1402 return -EINVAL; 2023 return -EINVAL;
1403 2024
1404 drv = wiphy_to_dev(wiphy); 2025 drv = wiphy_to_dev(request_wiphy);
1405 2026
1406 drv->country_ie_alpha2[0] = rd->alpha2[0]; 2027 drv->country_ie_alpha2[0] = rd->alpha2[0];
1407 drv->country_ie_alpha2[1] = rd->alpha2[1]; 2028 drv->country_ie_alpha2[1] = rd->alpha2[1];
@@ -1419,13 +2040,17 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
1419} 2040}
1420 2041
1421 2042
1422/* Use this call to set the current regulatory domain. Conflicts with 2043/*
2044 * Use this call to set the current regulatory domain. Conflicts with
1423 * multiple drivers can be ironed out later. Caller must've already 2045 * multiple drivers can be ironed out later. Caller must've already
1424 * kmalloc'd the rd structure. Caller must hold cfg80211_drv_mutex */ 2046 * kmalloc'd the rd structure. Caller must hold cfg80211_mutex
2047 */
1425int set_regdom(const struct ieee80211_regdomain *rd) 2048int set_regdom(const struct ieee80211_regdomain *rd)
1426{ 2049{
1427 int r; 2050 int r;
1428 2051
2052 assert_cfg80211_lock();
2053
1429 /* Note that this doesn't update the wiphys, this is done below */ 2054 /* Note that this doesn't update the wiphys, this is done below */
1430 r = __set_regdom(rd); 2055 r = __set_regdom(rd);
1431 if (r) { 2056 if (r) {
@@ -1445,53 +2070,82 @@ int set_regdom(const struct ieee80211_regdomain *rd)
1445 return r; 2070 return r;
1446} 2071}
1447 2072
1448/* Caller must hold cfg80211_drv_mutex */ 2073/* Caller must hold cfg80211_mutex */
1449void reg_device_remove(struct wiphy *wiphy) 2074void reg_device_remove(struct wiphy *wiphy)
1450{ 2075{
1451 if (!last_request || !last_request->wiphy) 2076 struct wiphy *request_wiphy;
2077
2078 assert_cfg80211_lock();
2079
2080 request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
2081
2082 kfree(wiphy->regd);
2083 if (!last_request || !request_wiphy)
1452 return; 2084 return;
1453 if (last_request->wiphy != wiphy) 2085 if (request_wiphy != wiphy)
1454 return; 2086 return;
1455 last_request->wiphy = NULL; 2087 last_request->wiphy_idx = WIPHY_IDX_STALE;
1456 last_request->country_ie_env = ENVIRON_ANY; 2088 last_request->country_ie_env = ENVIRON_ANY;
1457} 2089}
1458 2090
1459int regulatory_init(void) 2091int regulatory_init(void)
1460{ 2092{
1461 int err; 2093 int err = 0;
1462 2094
1463 reg_pdev = platform_device_register_simple("regulatory", 0, NULL, 0); 2095 reg_pdev = platform_device_register_simple("regulatory", 0, NULL, 0);
1464 if (IS_ERR(reg_pdev)) 2096 if (IS_ERR(reg_pdev))
1465 return PTR_ERR(reg_pdev); 2097 return PTR_ERR(reg_pdev);
1466 2098
2099 spin_lock_init(&reg_requests_lock);
2100 spin_lock_init(&reg_pending_beacons_lock);
2101
1467#ifdef CONFIG_WIRELESS_OLD_REGULATORY 2102#ifdef CONFIG_WIRELESS_OLD_REGULATORY
1468 cfg80211_regdomain = static_regdom(ieee80211_regdom); 2103 cfg80211_regdomain = static_regdom(ieee80211_regdom);
1469 2104
1470 printk(KERN_INFO "cfg80211: Using static regulatory domain info\n"); 2105 printk(KERN_INFO "cfg80211: Using static regulatory domain info\n");
1471 print_regdomain_info(cfg80211_regdomain); 2106 print_regdomain_info(cfg80211_regdomain);
1472 /* The old code still requests for a new regdomain and if 2107 /*
2108 * The old code still requests for a new regdomain and if
1473 * you have CRDA you get it updated, otherwise you get 2109 * you have CRDA you get it updated, otherwise you get
1474 * stuck with the static values. We ignore "EU" code as 2110 * stuck with the static values. We ignore "EU" code as
1475 * that is not a valid ISO / IEC 3166 alpha2 */ 2111 * that is not a valid ISO / IEC 3166 alpha2
2112 */
1476 if (ieee80211_regdom[0] != 'E' || ieee80211_regdom[1] != 'U') 2113 if (ieee80211_regdom[0] != 'E' || ieee80211_regdom[1] != 'U')
1477 err = __regulatory_hint(NULL, REGDOM_SET_BY_CORE, 2114 err = regulatory_hint_core(ieee80211_regdom);
1478 ieee80211_regdom, 0, ENVIRON_ANY);
1479#else 2115#else
1480 cfg80211_regdomain = cfg80211_world_regdom; 2116 cfg80211_regdomain = cfg80211_world_regdom;
1481 2117
1482 err = __regulatory_hint(NULL, REGDOM_SET_BY_CORE, "00", 0, ENVIRON_ANY); 2118 err = regulatory_hint_core("00");
1483 if (err) 2119#endif
1484 printk(KERN_ERR "cfg80211: calling CRDA failed - " 2120 if (err) {
1485 "unable to update world regulatory domain, " 2121 if (err == -ENOMEM)
1486 "using static definition\n"); 2122 return err;
2123 /*
2124 * N.B. kobject_uevent_env() can fail mainly for when we're out
2125 * memory which is handled and propagated appropriately above
2126 * but it can also fail during a netlink_broadcast() or during
2127 * early boot for call_usermodehelper(). For now treat these
2128 * errors as non-fatal.
2129 */
2130 printk(KERN_ERR "cfg80211: kobject_uevent_env() was unable "
2131 "to call CRDA during init");
2132#ifdef CONFIG_CFG80211_REG_DEBUG
2133 /* We want to find out exactly why when debugging */
2134 WARN_ON(err);
1487#endif 2135#endif
2136 }
1488 2137
1489 return 0; 2138 return 0;
1490} 2139}
1491 2140
1492void regulatory_exit(void) 2141void regulatory_exit(void)
1493{ 2142{
1494 mutex_lock(&cfg80211_drv_mutex); 2143 struct regulatory_request *reg_request, *tmp;
2144 struct reg_beacon *reg_beacon, *btmp;
2145
2146 cancel_work_sync(&reg_work);
2147
2148 mutex_lock(&cfg80211_mutex);
1495 2149
1496 reset_regdomains(); 2150 reset_regdomains();
1497 2151
@@ -1502,5 +2156,33 @@ void regulatory_exit(void)
1502 2156
1503 platform_device_unregister(reg_pdev); 2157 platform_device_unregister(reg_pdev);
1504 2158
1505 mutex_unlock(&cfg80211_drv_mutex); 2159 spin_lock_bh(&reg_pending_beacons_lock);
2160 if (!list_empty(&reg_pending_beacons)) {
2161 list_for_each_entry_safe(reg_beacon, btmp,
2162 &reg_pending_beacons, list) {
2163 list_del(&reg_beacon->list);
2164 kfree(reg_beacon);
2165 }
2166 }
2167 spin_unlock_bh(&reg_pending_beacons_lock);
2168
2169 if (!list_empty(&reg_beacon_list)) {
2170 list_for_each_entry_safe(reg_beacon, btmp,
2171 &reg_beacon_list, list) {
2172 list_del(&reg_beacon->list);
2173 kfree(reg_beacon);
2174 }
2175 }
2176
2177 spin_lock(&reg_requests_lock);
2178 if (!list_empty(&reg_requests_list)) {
2179 list_for_each_entry_safe(reg_request, tmp,
2180 &reg_requests_list, list) {
2181 list_del(&reg_request->list);
2182 kfree(reg_request);
2183 }
2184 }
2185 spin_unlock(&reg_requests_lock);
2186
2187 mutex_unlock(&cfg80211_mutex);
1506} 2188}
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-23 19:38:12 -0500