From: Abhijeet Kolekar <abhijeet.kolekar@xxxxxxxxx>
A new wireless regulatory API has been added and
static definitions of regulatory alpha2 have been removed.
As a result of this 5Ghz channels have been disabled by default.
Patch takes care of this by setting the regulatory domain
by reading the EEPROM contents.
It uses regulatory_hint function to dynamically set the regulatory
channels.
This patch is related to bug 11870 at bugzilla.kernel.org. With
correct regulatory information the number of channels to scan
will be correct and not zero as seen in that bug.
This patch eliminates the need for wireless to be compiled with
CONFIG_WIRELESS_OLD_REGULATORY to get correct regulatory behavior with
iwl3945.
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@xxxxxxxxx>
Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Signed-off-by: Reinette Chatre <reinette.chatre@xxxxxxxxx>
---
Could you please send up to 2.6.28? This patch is not valid for
wireless-testing - we will send another patch when regulatory_struct_hint
is available.
drivers/net/wireless/iwlwifi/iwl-3945.h | 3 +
drivers/net/wireless/iwlwifi/iwl3945-base.c | 89 +++++++++++++++++++++++++--
2 files changed, 87 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index bdd3247..f095b13 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -626,6 +626,7 @@ extern void iwl3945_hw_cancel_deferred_work(struct iwl3945_priv *priv);
extern int iwl3945_hw_rxq_stop(struct iwl3945_priv *priv);
extern int iwl3945_hw_set_hw_setting(struct iwl3945_priv *priv);
extern int iwl3945_hw_nic_init(struct iwl3945_priv *priv);
+extern int iwl3945_set_reg_domain(struct iwl3945_priv *priv);
extern int iwl3945_hw_nic_stop_master(struct iwl3945_priv *priv);
extern void iwl3945_hw_txq_ctx_free(struct iwl3945_priv *priv);
extern void iwl3945_hw_txq_ctx_stop(struct iwl3945_priv *priv);
@@ -705,6 +706,8 @@ struct iwl3945_priv {
struct ieee80211_rate *ieee_rates;
struct iwl_3945_cfg *cfg; /* device configuration */
+ struct ieee80211_regdomain *rd; /*Regulatroy Domain Information */
+
/* temporary frame storage list */
struct list_head free_frames;
int frames_count;
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index d15a2c9..f956c5d 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -4936,6 +4936,38 @@ static void iwl3945_init_hw_rates(struct iwl3945_priv *priv,
}
}
}
+/* Regulatory Domains
+* After 2.6.29 , driver has to pass regulatory domain or alpha2 to
+* core wireless CRDA using regulatory_hint api
+*/
+
+/**
+ * iwl3945_set_reg_domain - Set Regulatory Domain
+ */
+
+int iwl3945_set_reg_domain(struct iwl3945_priv *priv)
+{
+ int err;
+
+ IWL_DEBUG_INFO("Setting Regulatory Domain\n");
+ err = regulatory_hint(priv->hw->wiphy, NULL, priv->rd);
+ if (err) {
+ if (err == -EALREADY)
+ err = 0;
+ kfree(priv->rd);
+ }
+
+ return err;
+}
+
+#define REG_RULES(rule, start, end, bw, gain, eirp, reg_flags) { \
+ rule.freq_range.start_freq_khz = (start) * 1000; \
+ rule.freq_range.end_freq_khz = (end) * 1000; \
+ rule.freq_range.max_bandwidth_khz = (bw) * 1000; \
+ rule.power_rule.max_antenna_gain = (gain) * 100; \
+ rule.power_rule.max_eirp = (eirp) * 100; \
+ rule.flags = reg_flags; \
+ }
/**
* iwl3945_init_geos - Initialize mac80211's geo/channel info based from eeprom
@@ -4947,7 +4979,9 @@ static int iwl3945_init_geos(struct iwl3945_priv *priv)
struct ieee80211_channel *channels;
struct ieee80211_channel *geo_ch;
struct ieee80211_rate *rates;
- int i = 0;
+ int i = 0, reg_flags = 0, reg_count;
+ struct ieee80211_reg_rule *reg_rule;
+ int size_of_regd;
if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
@@ -4956,14 +4990,22 @@ static int iwl3945_init_geos(struct iwl3945_priv *priv)
return 0;
}
+ reg_rule = kzalloc(sizeof(struct ieee80211_reg_rule) *
+ priv->channel_count, GFP_KERNEL);
+ if (!reg_rule)
+ return -ENOMEM;
+
channels = kzalloc(sizeof(struct ieee80211_channel) *
priv->channel_count, GFP_KERNEL);
- if (!channels)
+ if (!channels) {
+ kfree(reg_rule);
return -ENOMEM;
+ }
rates = kzalloc((sizeof(struct ieee80211_rate) * (IWL_RATE_COUNT + 1)),
GFP_KERNEL);
if (!rates) {
+ kfree(reg_rule);
kfree(channels);
return -ENOMEM;
}
@@ -4986,7 +5028,7 @@ static int iwl3945_init_geos(struct iwl3945_priv *priv)
iwl3945_init_hw_rates(priv, rates);
- for (i = 0; i < priv->channel_count; i++) {
+ for (i = 0, reg_count = 0; i < priv->channel_count; i++) {
ch = &priv->channel_info[i];
/* FIXME: might be removed if scan is OK*/
@@ -5006,11 +5048,15 @@ static int iwl3945_init_geos(struct iwl3945_priv *priv)
geo_ch->hw_value = ch->channel;
if (is_channel_valid(ch)) {
- if (!(ch->flags & EEPROM_CHANNEL_IBSS))
+ if (!(ch->flags & EEPROM_CHANNEL_IBSS)) {
+ reg_flags |= NL80211_RRF_NO_IBSS;
geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
+ }
- if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
+ if (!(ch->flags & EEPROM_CHANNEL_ACTIVE)) {
+ reg_flags |= NL80211_RRF_PASSIVE_SCAN;
geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+ }
if (ch->flags & EEPROM_CHANNEL_RADAR)
geo_ch->flags |= IEEE80211_CHAN_RADAR;
@@ -5025,6 +5071,13 @@ static int iwl3945_init_geos(struct iwl3945_priv *priv)
/* Save flags for reg domain usage */
geo_ch->orig_flags = geo_ch->flags;
+ /* Add new Regulatory channel */
+ REG_RULES(reg_rule[reg_count], geo_ch->center_freq - 20,
+ geo_ch->center_freq + 20, 40, geo_ch->max_antenna_gain,
+ geo_ch->max_power, reg_flags);
+ reg_flags = 0;
+ reg_count++;
+
IWL_DEBUG_INFO("Channel %d Freq=%d[%sGHz] %s flag=0%X\n",
ch->channel, geo_ch->center_freq,
is_channel_a_band(ch) ? "5.2" : "2.4",
@@ -5054,8 +5107,28 @@ static int iwl3945_init_geos(struct iwl3945_priv *priv)
priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
&priv->bands[IEEE80211_BAND_5GHZ];
+ size_of_regd = sizeof(struct ieee80211_regdomain) +
+ (reg_count * sizeof(struct ieee80211_reg_rule));
+
+ priv->rd = kzalloc(size_of_regd, GFP_KERNEL);
+ if (!priv->rd) {
+ kfree(reg_rule);
+ kfree(channels);
+ kfree(rates);
+ return -ENOMEM;
+ }
+
+ priv->rd->n_reg_rules = reg_count;
+ strncpy(priv->rd->alpha2, "99", 2);
+
+ for (i = 0; i < reg_count; i++) {
+ memcpy(&priv->rd->reg_rules[i], ®_rule[i],
+ sizeof(struct ieee80211_reg_rule));
+ }
+
set_bit(STATUS_GEO_CONFIGURED, &priv->status);
+ kfree(reg_rule);
return 0;
}
@@ -8071,6 +8144,12 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
pci_save_state(pdev);
pci_disable_device(pdev);
+ err = iwl3945_set_reg_domain(priv);
+ if (err) {
+ IWL_ERROR("Failed to set regulatory domain (error %d)\n", err);
+ goto out_free_geos;
+ }
+
err = iwl3945_rfkill_init(priv);
if (err)
IWL_ERROR("Unable to initialize RFKILL system. "
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
