diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-03-09 22:07:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-03-16 18:09:40 -0400 |
commit | 7db90f4a25bd4184f3d36dfa4f512f53b0448da7 (patch) | |
tree | 839b8103801cac9342763e1b62e84730a8050ccc /include | |
parent | 0fee54cab7d5ebc58fad8c6a0703c4ea016405e3 (diff) |
cfg80211: move enum reg_set_by to nl80211.h
We do this so we can later inform userspace who set the
regulatory domain and provide details of the request.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nl80211.h | 19 | ||||
-rw-r--r-- | include/net/cfg80211.h | 24 |
2 files changed, 22 insertions, 21 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index f6e56370ea65..c0fd432b57dc 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -673,6 +673,25 @@ enum nl80211_bitrate_attr { | |||
673 | }; | 673 | }; |
674 | 674 | ||
675 | /** | 675 | /** |
676 | * enum nl80211_initiator - Indicates the initiator of a reg domain request | ||
677 | * @NL80211_REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world | ||
678 | * regulatory domain. | ||
679 | * @NL80211_REGDOM_SET_BY_USER: User asked the wireless core to set the | ||
680 | * regulatory domain. | ||
681 | * @NL80211_REGDOM_SET_BY_DRIVER: a wireless drivers has hinted to the | ||
682 | * wireless core it thinks its knows the regulatory domain we should be in. | ||
683 | * @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an | ||
684 | * 802.11 country information element with regulatory information it | ||
685 | * thinks we should consider. | ||
686 | */ | ||
687 | enum nl80211_reg_initiator { | ||
688 | NL80211_REGDOM_SET_BY_CORE, | ||
689 | NL80211_REGDOM_SET_BY_USER, | ||
690 | NL80211_REGDOM_SET_BY_DRIVER, | ||
691 | NL80211_REGDOM_SET_BY_COUNTRY_IE, | ||
692 | }; | ||
693 | |||
694 | /** | ||
676 | * enum nl80211_reg_rule_attr - regulatory rule attributes | 695 | * enum nl80211_reg_rule_attr - regulatory rule attributes |
677 | * @NL80211_ATTR_REG_RULE_FLAGS: a set of flags which specify additional | 696 | * @NL80211_ATTR_REG_RULE_FLAGS: a set of flags which specify additional |
678 | * considerations for a given frequency range. These are the | 697 | * considerations for a given frequency range. These are the |
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index f195ea460811..50f3fd9ff524 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -349,27 +349,9 @@ struct bss_parameters { | |||
349 | }; | 349 | }; |
350 | 350 | ||
351 | /** | 351 | /** |
352 | * enum reg_set_by - Indicates who is trying to set the regulatory domain | ||
353 | * @REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world regulatory domain. | ||
354 | * @REGDOM_SET_BY_USER: User asked the wireless core to set the | ||
355 | * regulatory domain. | ||
356 | * @REGDOM_SET_BY_DRIVER: a wireless drivers has hinted to the wireless core | ||
357 | * it thinks its knows the regulatory domain we should be in. | ||
358 | * @REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an 802.11 country | ||
359 | * information element with regulatory information it thinks we | ||
360 | * should consider. | ||
361 | */ | ||
362 | enum reg_set_by { | ||
363 | REGDOM_SET_BY_CORE, | ||
364 | REGDOM_SET_BY_USER, | ||
365 | REGDOM_SET_BY_DRIVER, | ||
366 | REGDOM_SET_BY_COUNTRY_IE, | ||
367 | }; | ||
368 | |||
369 | /** | ||
370 | * enum environment_cap - Environment parsed from country IE | 352 | * enum environment_cap - Environment parsed from country IE |
371 | * @ENVIRON_ANY: indicates country IE applies to both indoor and | 353 | * @ENVIRON_ANY: indicates country IE applies to both indoor and |
372 | * outdoor operation. | 354 | * outdoor operation. |
373 | * @ENVIRON_INDOOR: indicates country IE applies only to indoor operation | 355 | * @ENVIRON_INDOOR: indicates country IE applies only to indoor operation |
374 | * @ENVIRON_OUTDOOR: indicates country IE applies only to outdoor operation | 356 | * @ENVIRON_OUTDOOR: indicates country IE applies only to outdoor operation |
375 | */ | 357 | */ |
@@ -388,7 +370,7 @@ enum environment_cap { | |||
388 | * and potentially inform users of which devices specifically | 370 | * and potentially inform users of which devices specifically |
389 | * cased the conflicts. | 371 | * cased the conflicts. |
390 | * @initiator: indicates who sent this request, could be any of | 372 | * @initiator: indicates who sent this request, could be any of |
391 | * of those set in reg_set_by, %REGDOM_SET_BY_* | 373 | * of those set in nl80211_reg_initiator (%NL80211_REGDOM_SET_BY_*) |
392 | * @alpha2: the ISO / IEC 3166 alpha2 country code of the requested | 374 | * @alpha2: the ISO / IEC 3166 alpha2 country code of the requested |
393 | * regulatory domain. We have a few special codes: | 375 | * regulatory domain. We have a few special codes: |
394 | * 00 - World regulatory domain | 376 | * 00 - World regulatory domain |
@@ -405,7 +387,7 @@ enum environment_cap { | |||
405 | */ | 387 | */ |
406 | struct regulatory_request { | 388 | struct regulatory_request { |
407 | int wiphy_idx; | 389 | int wiphy_idx; |
408 | enum reg_set_by initiator; | 390 | enum nl80211_reg_initiator initiator; |
409 | char alpha2[2]; | 391 | char alpha2[2]; |
410 | bool intersect; | 392 | bool intersect; |
411 | u32 country_ie_checksum; | 393 | u32 country_ie_checksum; |