cfg80211: rename fw_handles_regulatory to custom_regulatory

Drivers without firmware can also have custom regulatory maps
which do not map to a specific ISO / IEC alpha2 country code.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index f24d3b40e8e4ea64e898eb1e1df6cd256b5f5ac7..9f284ebb6c28de8e8a24dcee2b38b2f1c86ef31c 100644 (file)
--- 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 d520bfe2db990a24a7364c48747990f5cfa045de..de8c8d7ca0fec165bff10da22f30466861ec142e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -7011,7 +7011,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 f68602eb4160e5ba059b43c7de6a273bf1982d87..c3f6e462ec2d2fb65b62c90c2bd25a5341466083 100644 (file)
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -181,8 +181,8 @@ struct ieee80211_supported_band {
  * struct wiphy - wireless hardware description
  * @idx: the wiphy index assigned to this item
  * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
- * @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).
@@ -201,7 +201,7 @@ struct wiphy {
        /* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */
        u16 interface_modes;
 
-       bool fw_handles_regulatory;
+       bool custom_regulatory;
 
        /* If multiple wiphys are registered and you're handed e.g.
         * a regular netdev with assigned ieee80211_ptr, you won't

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index c201abd38ad145dd78ed4914af4603cd7b9faec4..5db02a3d9c02d470cce7cac89313514cf60837fc 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -927,7 +927,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;
 }