On Thu, 2009-01-15 at 16:12 -0800, Luis R. Rodriguez wrote:
> Drivers without firmware can also have custom regulatory maps
> which do not map to a specific ISO / IEC alpha2 country code.
Seems fine.
> Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
> ---
> drivers/net/wireless/iwlwifi/iwl-core.c | 2 +-
> drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +-
> include/net/wireless.h | 6 +++---
> net/wireless/reg.c | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
> index d2ef3e1..1d568ac 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-core.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-core.c
> @@ -811,7 +811,7 @@ int iwl_setup_mac(struct iwl_priv *priv)
> BIT(NL80211_IFTYPE_STATION) |
> BIT(NL80211_IFTYPE_ADHOC);
>
> - hw->wiphy->fw_handles_regulatory = true;
> + hw->wiphy->custom_regulatory = true;
>
> /* Default value; 4 EDCA QOS priorities */
> hw->queues = 4;
> diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
> index 15425a0..bbd44d5 100644
> --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
> +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
> @@ -7388,7 +7388,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
> BIT(NL80211_IFTYPE_STATION) |
> BIT(NL80211_IFTYPE_ADHOC);
>
> - hw->wiphy->fw_handles_regulatory = true;
> + hw->wiphy->custom_regulatory = true;
>
> /* 4 EDCA QOS priorities */
> hw->queues = 4;
> diff --git a/include/net/wireless.h b/include/net/wireless.h
> index 232047b..21e45bf 100644
> --- a/include/net/wireless.h
> +++ b/include/net/wireless.h
> @@ -184,8 +184,8 @@ struct ieee80211_supported_band {
> * @ignore_country_ies: tells us the wireless core should ignore country IEs
> * received by itself or by other wireless drivers. This will only
> * apply if the driver has provided a regulatory_hint()
> - * @fw_handles_regulatory: tells us the firmware for this device
> - * has its own regulatory solution and cannot identify the
> + * @custom_regulatory: tells us the driver for this device
> + * has its own custom regulatory domain and cannot identify the
> * ISO / IEC 3166 alpha2 it belongs to. When this is enabled
> * we will disregard the first regulatory hint (when the
> * initiator is %REGDOM_SET_BY_CORE).
> @@ -204,7 +204,7 @@ struct wiphy {
> /* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */
> u16 interface_modes;
>
> - bool fw_handles_regulatory;
> + bool custom_regulatory;
> bool ignore_country_ies;
>
> /* If multiple wiphys are registered and you're handed e.g.
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index f0ad937..8bf999d 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -1009,7 +1009,7 @@ static bool ignore_reg_update(struct wiphy *wiphy, enum reg_set_by setby)
> if (!last_request)
> return true;
> if (setby == REGDOM_SET_BY_CORE &&
> - wiphy->fw_handles_regulatory)
> + wiphy->custom_regulatory)
> return true;
> return false;
> }
Attachment:
signature.asc
Description: This is a digitally signed message part
