Commit 2a44f911 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

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: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e74b1e7f

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/net/wireless.h

+3 −3
Original line number Diff line number Diff line
@@ -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

net/wireless/reg.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}