--- Begin Message ---
The patch extends the current regulatory framework to support regulatory
enforcement by device hardware (firmware). If the regulatory check is
performed by hardware, the driver uses a special flag to indicate the
regulatory framework, so that the regulatory framework will bypass all
the regulatory checks for this device and delegate it to the hardware.
The implementation of this "bypass" introduces a virtual regulatory domain
which is a super set of all the existed regdomains. Note the virtual
regdomain allows to be overwritten by any other regdomains from user,
country IE, core, or other drivers.
The patch resolves the problem a wireless device doesn't export enough
information for the regulatory domain it uses. This information is
unnecessary if the regulatory check can be done by the hardware.
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
---
drivers/net/wireless/iwlwifi/iwl-agn.c | 4 ++
include/net/cfg80211.h | 4 ++
include/net/wireless.h | 5 ++-
net/wireless/reg.c | 52 ++++++++++++++++++++++++++++----
4 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 9882c65..6c4fe96 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -4322,6 +4322,10 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
if (err)
goto out_remove_sysfs;
+ err = regulatory_hint(priv->hw->wiphy, NULL, NULL, REGULATORY_HARDWARE);
+ if (err)
+ printk("regulatory_hint returns %d\n", err);
+
err = iwl_dbgfs_register(priv, DRV_NAME);
if (err)
IWL_ERROR("failed to create debugfs files\n");
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 0e85ec3..b829b17 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -299,6 +299,9 @@ struct bss_parameters {
* @REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an 802.11 country
* information element with regulatory information it thinks we
* should consider.
+ * @REGDOM_SET_BY_HARDWARE: a wireless device has the ability to perform
+ * regulatory enforcement. The wireless core should delegate the regulatory
+ * rules checking to the hardware.
*/
enum reg_set_by {
REGDOM_SET_BY_INIT,
@@ -306,6 +309,7 @@ enum reg_set_by {
REGDOM_SET_BY_USER,
REGDOM_SET_BY_DRIVER,
REGDOM_SET_BY_COUNTRY_IE,
+ REGDOM_SET_BY_HARDWARE,
};
struct ieee80211_freq_range {
diff --git a/include/net/wireless.h b/include/net/wireless.h
index c0aa0fb..08ff1e9 100644
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -367,6 +367,8 @@ ieee80211_get_channel(struct wiphy *wiphy, int freq)
*/
extern int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
const char *alpha2, struct ieee80211_regdomain *rd);
+
+#define REGULATORY_HARDWARE BIT(0)
/**
* regulatory_hint - driver hint to the wireless core a regulatory domain
* @wiphy: the driver's very own &struct wiphy
@@ -376,6 +378,7 @@ extern int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
* alpha2.
* @rd: a complete regulatory domain provided by the driver. If passed
* the driver does not need to worry about freeing it.
+ * @flags: regulatory flags passed by the driver
*
* Wireless drivers can use this function to hint to the wireless core
* what it believes should be the current regulatory domain by
@@ -391,5 +394,5 @@ extern int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
* See __regulatory_hint() documentation for possible return values.
*/
extern int regulatory_hint(struct wiphy *wiphy,
- const char *alpha2, struct ieee80211_regdomain *rd);
+ const char *alpha2, struct ieee80211_regdomain *rd, u32 flags);
#endif /* __NET_WIRELESS_H */
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 626dbb6..cb1df45 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -81,9 +81,30 @@ static const struct ieee80211_regdomain world_regdom = {
}
};
+/* A virtual regdomain which is the super set for all existed domains */
+static const struct ieee80211_regdomain virtual_regdom = {
+ .n_reg_rules = 4,
+ .alpha2 = "01",
+ .reg_rules = {
+ /* IEEE 802.11b/g, channels 1..14 */
+ REG_RULE(2412-10, 2484+10, 40, 6, 27, 0),
+ /* IEEE 802.11a, channel 36..64 */
+ REG_RULE(5170-10, 5320+10, 40, 6, 23, 0),
+ /* IEEE 802.11a, channels 100..140 */
+ REG_RULE(5500-10, 5700+10, 40, 6, 30,
+ NL80211_RRF_NO_IBSS |
+ NL80211_RRF_DFS),
+ /* IEEE 802.11a, channels 149..165, outdoor */
+ REG_RULE(5745-10, 5825+10, 40, 6, 30, 0),
+ }
+};
+
static const struct ieee80211_regdomain *cfg80211_world_regdom =
&world_regdom;
+static const struct ieee80211_regdomain *cfg80211_virtual_regdom =
+ &virtual_regdom;
+
#ifdef CONFIG_WIRELESS_OLD_REGULATORY
static char *ieee80211_regdom = "US";
module_param(ieee80211_regdom, charp, 0444);
@@ -184,11 +205,14 @@ static inline bool is_old_static_regdom(const struct ieee80211_regdomain *rd)
static void reset_regdomains(void)
{
/* avoid freeing static information or freeing something twice */
- if (cfg80211_regdomain == cfg80211_world_regdom)
+ if ((cfg80211_regdomain == cfg80211_world_regdom) ||
+ (cfg80211_regdomain == cfg80211_virtual_regdom))
cfg80211_regdomain = NULL;
- if (cfg80211_world_regdom == &world_regdom)
+ if ((cfg80211_world_regdom == &world_regdom) ||
+ (cfg80211_world_regdom == &virtual_regdom))
cfg80211_world_regdom = NULL;
- if (cfg80211_regdomain == &world_regdom)
+ if ((cfg80211_regdomain == &world_regdom) ||
+ (cfg80211_regdomain == &virtual_regdom))
cfg80211_regdomain = NULL;
if (is_old_static_regdom(cfg80211_regdomain))
cfg80211_regdomain = NULL;
@@ -314,6 +338,11 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by,
last_request = list_first_entry(®ulatory_requests,
struct regulatory_request, list);
+ /* Any request can overwrite the virtual regdomain set by hardware. */
+ if ((last_request->initiator == REGDOM_SET_BY_HARDWARE) &&
+ (set_by != REGDOM_SET_BY_HARDWARE))
+ return 0;
+
switch (set_by) {
case REGDOM_SET_BY_INIT:
return -EINVAL;
@@ -390,6 +419,10 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by,
if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE)
return -EOPNOTSUPP;
return 0;
+ case REGDOM_SET_BY_HARDWARE:
+ if (last_request->initiator == REGDOM_SET_BY_CORE)
+ return 0;
+ return -EALREADY;
default:
return -EINVAL;
}
@@ -600,6 +633,7 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
case REGDOM_SET_BY_COUNTRY_IE:
case REGDOM_SET_BY_DRIVER:
case REGDOM_SET_BY_USER:
+ case REGDOM_SET_BY_HARDWARE:
request = kzalloc(sizeof(struct regulatory_request),
GFP_KERNEL);
if (!request)
@@ -629,14 +663,19 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
/* If rd is not NULL and if this call fails the caller must free it */
int regulatory_hint(struct wiphy *wiphy, const char *alpha2,
- struct ieee80211_regdomain *rd)
+ struct ieee80211_regdomain *rd, u32 flags)
{
int r;
- BUG_ON(!rd && !alpha2);
+ enum reg_set_by setby = (flags & REGULATORY_HARDWARE) ?
+ REGDOM_SET_BY_HARDWARE : REGDOM_SET_BY_DRIVER;
+
+ BUG_ON(!rd && !alpha2 && !flags);
+ if (flags & REGULATORY_HARDWARE)
+ rd = (struct ieee80211_regdomain *) cfg80211_virtual_regdom;
mutex_lock(&cfg80211_drv_mutex);
- r = __regulatory_hint(wiphy, REGDOM_SET_BY_DRIVER, alpha2, rd);
+ r = __regulatory_hint(wiphy, setby, alpha2, rd);
if (r || !rd)
goto unlock_and_exit;
@@ -752,6 +791,7 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
case REGDOM_SET_BY_CORE:
case REGDOM_SET_BY_DRIVER:
case REGDOM_SET_BY_USER:
+ case REGDOM_SET_BY_HARDWARE:
if (!is_valid_rd(rd)) {
printk(KERN_ERR "cfg80211: Invalid "
"regulatory domain detected:\n");
--
1.5.3.6
--- End Message ---
