[PATCH 0/7] cfg80211: few regulatory fixes and debugging enhancements

[PATCH 0/7] cfg80211: few regulatory fixes and debugging enhancements

[Luis R. Rodriguez]

Easwar reported some odd issues with ath9k regarding regulatory
while during the 2.6.36-rc cycles. Unfortunately I was only able
to address the issues for these reported issues until now as I had
other higher priority items on my plate. It turns out that some of
these issues are pretty serious, mostly the one that does not apply
regulatory updates for disabling a band when that is the intention.

These issues were simply overlooked but they are part of the design,
so we target a few of these fixes to stable. The new debugging stuff
is left only for the development series on the next kernel.

There is one world regulatory domain update we are considering now
for the Atheros cards, but we haven't yet decided on this. I'll send
the patch if we agree on it next. Thanks to Easwar for his reports
and work on this.

Luis R. Rodriguez (7):
  cfg80211: pass the reg hint initiator to helpers
  cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY
  cfg80211: fix disabling channels based on hints
  cfg80211: add debug prints for when we ignore regulatory hints
  cfg80211: add debug print when disabling a channel on a custom regd
  cfg80211: add debug print when processing a channel
  cfg80211: prefix REG_DBG_PRINT() with cfg80211

 include/linux/nl80211.h |    6 ++-
 include/net/cfg80211.h  |   15 +++---
 net/wireless/reg.c      |  133 +++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 130 insertions(+), 24 deletions(-)

[PATCH 1/7] cfg80211: pass the reg hint initiator to helpers

[Luis R. Rodriguez]

This is required later.

Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Cc: stable@kernel.org
signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/wireless/reg.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 4b9f891..b64596f 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -720,7 +720,9 @@ EXPORT_SYMBOL(freq_reg_info);
  * on the wiphy with the target_bw specified. Then we can simply use
  * that below for the desired_bw_khz below.
  */
-static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
+static void handle_channel(struct wiphy *wiphy,
+			   enum nl80211_reg_initiator initiator,
+			   enum ieee80211_band band,
 			   unsigned int chan_idx)
 {
 	int r;
@@ -784,7 +786,9 @@ static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
 		chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp);
 }
 
-static void handle_band(struct wiphy *wiphy, enum ieee80211_band band)
+static void handle_band(struct wiphy *wiphy,
+			enum ieee80211_band band,
+			enum nl80211_reg_initiator initiator)
 {
 	unsigned int i;
 	struct ieee80211_supported_band *sband;
@@ -793,7 +797,7 @@ static void handle_band(struct wiphy *wiphy, enum ieee80211_band band)
 	sband = wiphy->bands[band];
 
 	for (i = 0; i < sband->n_channels; i++)
-		handle_channel(wiphy, band, i);
+		handle_channel(wiphy, initiator, band, i);
 }
 
 static bool ignore_reg_update(struct wiphy *wiphy,
@@ -1030,7 +1034,7 @@ void wiphy_update_regulatory(struct wiphy *wiphy,
 		goto out;
 	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
 		if (wiphy->bands[band])
-			handle_band(wiphy, band);
+			handle_band(wiphy, band, initiator);
 	}
 out:
 	reg_process_beacons(wiphy);
-- 
1.7.0.4

[PATCH 2/7] cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY

[Luis R. Rodriguez]

We should be enabling country IE hints for WIPHY_FLAG_STRICT_REGULATORY
even if we haven't yet recieved regulatory domain hint for the driver
if it needed one. Without this Country IEs are not passed on to drivers
that have set WIPHY_FLAG_STRICT_REGULATORY, today this is just all
Atheros chipset drivers: ath5k, ath9k, ar9170, carl9170.

This was part of the original design, however it was completely
overlooked...

Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 include/net/cfg80211.h |   15 ++++++++-------
 net/wireless/reg.c     |    1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 2a7936d..352ebc5 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1321,13 +1321,14 @@ struct cfg80211_ops {
  * 	initiator is %REGDOM_SET_BY_CORE).
  * @WIPHY_FLAG_STRICT_REGULATORY: tells us the driver for this device will
  *	ignore regulatory domain settings until it gets its own regulatory
- *	domain via its regulatory_hint(). After its gets its own regulatory
- *	domain it will only allow further regulatory domain settings to
- *	further enhance compliance. For example if channel 13 and 14 are
- *	disabled by this regulatory domain no user regulatory domain can
- *	enable these channels at a later time. This can be used for devices
- *	which do not have calibration information gauranteed for frequencies
- *	or settings outside of its regulatory domain.
+ *	domain via its regulatory_hint() unless the regulatory hint is
+ *	from a country IE. After its gets its own regulatory domain it will
+ *	only allow further regulatory domain settings to further enhance
+ *	compliance. For example if channel 13 and 14 are disabled by this
+ *	regulatory domain no user regulatory domain can enable these channels
+ *	at a later time. This can be used for devices which do not have
+ *	calibration information gauranteed for frequencies or settings
+ *	outside of its regulatory domain.
  * @WIPHY_FLAG_DISABLE_BEACON_HINTS: enable this if your driver needs to ensure
  *	that passive scan flags and beaconing flags may not be lifted by
  *	cfg80211 due to regulatory beacon hints. For more information on beacon
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index b64596f..1bc8131 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -813,6 +813,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
 	 * desired regulatory domain set
 	 */
 	if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !wiphy->regd &&
+	    initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
 	    !is_world_regdom(last_request->alpha2))
 		return true;
 	return false;
-- 
1.7.0.4

Re: [PATCH 2/7] cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY

[Gábor Stefanik]

On Wed, Oct 20, 2010 at 7:18 PM, Luis R. Rodriguez
<lrodriguez@atheros.com> wrote:
> We should be enabling country IE hints for WIPHY_FLAG_STRICT_REGULATORY
> even if we haven't yet recieved regulatory domain hint for the driver
> if it needed one. Without this Country IEs are not passed on to drivers
> that have set WIPHY_FLAG_STRICT_REGULATORY, today this is just all
> Atheros chipset drivers: ath5k, ath9k, ar9170, carl9170.
>
> This was part of the original design, however it was completely
> overlooked...
>
> Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
> Cc: stable@kernel.org
> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
> ---
>  include/net/cfg80211.h |   15 ++++++++-------
>  net/wireless/reg.c     |    1 +
>  2 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
> index 2a7936d..352ebc5 100644
> --- a/include/net/cfg80211.h
> +++ b/include/net/cfg80211.h
> @@ -1321,13 +1321,14 @@ struct cfg80211_ops {
>  *     initiator is %REGDOM_SET_BY_CORE).
>  * @WIPHY_FLAG_STRICT_REGULATORY: tells us the driver for this device will
>  *     ignore regulatory domain settings until it gets its own regulatory
> - *     domain via its regulatory_hint(). After its gets its own regulatory
> - *     domain it will only allow further regulatory domain settings to
> - *     further enhance compliance. For example if channel 13 and 14 are
> - *     disabled by this regulatory domain no user regulatory domain can
> - *     enable these channels at a later time. This can be used for devices
> - *     which do not have calibration information gauranteed for frequencies
> - *     or settings outside of its regulatory domain.
> + *     domain via its regulatory_hint() unless the regulatory hint is
> + *     from a country IE. After its gets its own regulatory domain it will
> + *     only allow further regulatory domain settings to further enhance
> + *     compliance. For example if channel 13 and 14 are disabled by this
> + *     regulatory domain no user regulatory domain can enable these channels
> + *     at a later time. This can be used for devices which do not have
> + *     calibration information gauranteed for frequencies or settings
Typo (guaranteed).


> + *     outside of its regulatory domain.
>  * @WIPHY_FLAG_DISABLE_BEACON_HINTS: enable this if your driver needs to ensure
>  *     that passive scan flags and beaconing flags may not be lifted by
>  *     cfg80211 due to regulatory beacon hints. For more information on beacon
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index b64596f..1bc8131 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -813,6 +813,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
>         * desired regulatory domain set
>         */
>        if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !wiphy->regd &&
> +           initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
>            !is_world_regdom(last_request->alpha2))
>                return true;
>        return false;
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>



-- 
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

[PATCH 3/7] cfg80211: fix disabling channels based on hints

[Luis R. Rodriguez]

After a module loads you will have loaded the world roaming regulatory
domain or a custom regulatory domain. Further regulatory hints are
welcomed and should be respected unless the regulatory hint is coming
from a country IE as the IEEE spec allows for a country IE to be a subset
of what is allowed by the local regulatory agencies.

So disable all channels that do not fit a regulatory domain sent
from a unless the hint is from a country IE and the country IE had
no information about the band we are currently processing.

This fixes a few regulatory issues, for example for drivers that depend
on CRDA and had no 5 GHz freqencies allowed were not properly disabling
5 GHz at all, furthermore it also allows users to restrict devices
further as was intended.

If you recieve a country IE upon association we will also disable the
channels that are not allowed if the country IE had at least one
channel on the respective band we are procesing.

This was the original intention behind this design but it was
completely overlooked...

Cc: David Quan <david.quan@atheros.com>
Cc: Jouni Malinen <jouni.malinen@atheros.com>
cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 include/linux/nl80211.h |    6 +++++-
 net/wireless/reg.c      |   20 +++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 0edb256..fb877b5 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -1307,7 +1307,11 @@ enum nl80211_bitrate_attr {
  * 	wireless core it thinks its knows the regulatory domain we should be in.
  * @NL80211_REGDOM_SET_BY_COUNTRY_IE: the wireless core has received an
  * 	802.11 country information element with regulatory information it
- * 	thinks we should consider.
+ * 	thinks we should consider. cfg80211 only processes the country
+ *	code from the IE, and relies on the regulatory domain information
+ *	structure pased by userspace (CRDA) from our wireless-regdb.
+ *	If a channel is enabled but the country code indicates it should
+ *	be disabled we disable the channel and re-enable it upon disassociation.
  */
 enum nl80211_reg_initiator {
 	NL80211_REGDOM_SET_BY_CORE,
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 1bc8131..8ab65f2 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -750,8 +750,26 @@ static void handle_channel(struct wiphy *wiphy,
 			  desired_bw_khz,
 			  &reg_rule);
 
-	if (r)
+	if (r) {
+		/*
+		 * We will disable all channels that do not match our
+		 * recieved regulatory rule unless the hint is coming
+		 * from a Country IE and the Country IE had no information
+		 * about a band. The IEEE 802.11 spec allows for an AP
+		 * to send only a subset of the regulatory rules allowed,
+		 * so an AP in the US that only supports 2.4 GHz may only send
+		 * a country IE with information for the 2.4 GHz band
+		 * while 5 GHz is still supported.
+		 */
+		if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE &&
+		    r == -ERANGE)
+			return;
+
+		REG_DBG_PRINT("cfg80211: Disabling freq %d MHz\n",
+			      chan->center_freq);
+		chan->flags = IEEE80211_CHAN_DISABLED;
 		return;
+	}
 
 	power_rule = &reg_rule->power_rule;
 	freq_range = &reg_rule->freq_range;
-- 
1.7.0.4

[PATCH 4/7] cfg80211: add debug prints for when we ignore regulatory hints

[Luis R. Rodriguez]

This can help with debugging issues. You will only see
these with CONFIG_CFG80211_REG_DEBUG enabled.

Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/wireless/reg.c |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 8ab65f2..950f689 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -711,6 +711,23 @@ int freq_reg_info(struct wiphy *wiphy,
 }
 EXPORT_SYMBOL(freq_reg_info);
 
+static const char *reg_initiator_name(enum nl80211_reg_initiator initiator)
+{
+	switch (initiator) {
+	case NL80211_REGDOM_SET_BY_CORE:
+		return "Set by core";
+	case NL80211_REGDOM_SET_BY_USER:
+		return "Set by user";
+	case NL80211_REGDOM_SET_BY_DRIVER:
+		return "Set by driver";
+	case NL80211_REGDOM_SET_BY_COUNTRY_IE:
+		return "Set by country IE";
+	default:
+		WARN_ON(1);
+		return "Set by bug";
+	}
+}
+
 /*
  * Note that right now we assume the desired channel bandwidth
  * is always 20 MHz for each individual channel (HT40 uses 20 MHz
@@ -821,19 +838,36 @@ static void handle_band(struct wiphy *wiphy,
 static bool ignore_reg_update(struct wiphy *wiphy,
 			      enum nl80211_reg_initiator initiator)
 {
-	if (!last_request)
+	if (!last_request) {
+		REG_DBG_PRINT("cfg80211: Ignoring regulatory request %s since "
+			      "last_request is not set\n",
+			      reg_initiator_name(initiator));
 		return true;
+	}
+
 	if (initiator == NL80211_REGDOM_SET_BY_CORE &&
-	    wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY)
+	    wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) {
+		REG_DBG_PRINT("cfg80211: Ignoring regulatory request %s "
+			      "since the driver uses its own custom "
+			      "regulatory domain ",
+			      reg_initiator_name(initiator));
 		return true;
+	}
+
 	/*
 	 * wiphy->regd will be set once the device has its own
 	 * desired regulatory domain set
 	 */
 	if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !wiphy->regd &&
 	    initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
-	    !is_world_regdom(last_request->alpha2))
+	    !is_world_regdom(last_request->alpha2)) {
+		REG_DBG_PRINT("cfg80211: Ignoring regulatory request %s "
+			      "since the driver requires its own regulaotry "
+			      "domain to be set first",
+			      reg_initiator_name(initiator));
 		return true;
+	}
+
 	return false;
 }
 
-- 
1.7.0.4

[PATCH 5/7] cfg80211: add debug print when disabling a channel on a custom regd

[Luis R. Rodriguez]

Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/wireless/reg.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 950f689..62396b2 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1123,6 +1123,11 @@ static void handle_channel_custom(struct wiphy *wiphy,
 			       regd);
 
 	if (r) {
+		REG_DBG_PRINT("cfg80211: Disabling freq %d MHz as custom "
+			      "regd has no rule that fits a %d MHz "
+			      "wide channel\n",
+			      chan->center_freq,
+			      KHZ_TO_MHZ(desired_bw_khz));
 		chan->flags = IEEE80211_CHAN_DISABLED;
 		return;
 	}
-- 
1.7.0.4

[PATCH 6/7] cfg80211: add debug print when processing a channel

[Luis R. Rodriguez]

In the worst case you are seeing really odd things you want
more information than what is provided right now, for those
that insist and want debug info through CONFIG_CFG80211_REG_DEBUG
provide a print of when we are processing a channel and with what
regulatory rule.

Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/wireless/reg.c |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 62396b2..f0ff146 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -728,6 +728,42 @@ static const char *reg_initiator_name(enum nl80211_reg_initiator initiator)
 	}
 }
 
+#ifdef CONFIG_CFG80211_REG_DEBUG
+
+static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan,
+				    u32 desired_bw_khz,
+				    const struct ieee80211_reg_rule *reg_rule)
+{
+	const struct ieee80211_power_rule *power_rule;
+	const struct ieee80211_freq_range *freq_range;
+	char max_antenna_gain[32];
+
+	power_rule = &reg_rule->power_rule;
+	freq_range = &reg_rule->freq_range;
+
+	if (!power_rule->max_antenna_gain)
+		snprintf(max_antenna_gain, 32, "N/A");
+	else
+		snprintf(max_antenna_gain, 32, "%d", power_rule->max_antenna_gain);
+
+	REG_DBG_PRINT("cfg80211: Updating information on frequency %d MHz "
+		      "for %d a MHz width channel with regulatory rule:\n",
+		      chan->center_freq,
+		      KHZ_TO_MHZ(desired_bw_khz));
+
+	REG_DBG_PRINT("cfg80211: %d KHz - %d KHz @  KHz), (%s mBi, %d mBm)\n",
+		      freq_range->start_freq_khz,
+		      freq_range->end_freq_khz,
+		      max_antenna_gain,
+		      power_rule->max_eirp);
+}
+#else
+static void reg_reg_rule_print_dbg(const struct ieee80211_reg_rule *reg_rule)
+{
+	return;
+}
+#endif
+
 /*
  * Note that right now we assume the desired channel bandwidth
  * is always 20 MHz for each individual channel (HT40 uses 20 MHz
@@ -788,6 +824,8 @@ static void handle_channel(struct wiphy *wiphy,
 		return;
 	}
 
+	chan_reg_rule_print_dbg(chan, desired_bw_khz, reg_rule);
+
 	power_rule = &reg_rule->power_rule;
 	freq_range = &reg_rule->freq_range;
 
@@ -1132,6 +1170,8 @@ static void handle_channel_custom(struct wiphy *wiphy,
 		return;
 	}
 
+	chan_reg_rule_print_dbg(chan, desired_bw_khz, reg_rule);
+
 	power_rule = &reg_rule->power_rule;
 	freq_range = &reg_rule->freq_range;
 
-- 
1.7.0.4

Re: [PATCH 6/7] cfg80211: add debug print when processing a channel

[Senthil Balasubramanian]

On Wed, Oct 20, 2010 at 10:48:58PM +0530, Luis R. Rodriguez wrote:
> In the worst case you are seeing really odd things you want
> more information than what is provided right now, for those
> that insist and want debug info through CONFIG_CFG80211_REG_DEBUG
> provide a print of when we are processing a channel and with what
> regulatory rule.
> 
> Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
> ---
>  net/wireless/reg.c |   40 ++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 40 insertions(+), 0 deletions(-)
> 
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index 62396b2..f0ff146 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -728,6 +728,42 @@ static const char *reg_initiator_name(enum nl80211_reg_initiator initiator)
>  	}
>  }
>  
> +#ifdef CONFIG_CFG80211_REG_DEBUG
> +
> +static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan,
> +				    u32 desired_bw_khz,
> +				    const struct ieee80211_reg_rule *reg_rule)
> +{
> +	const struct ieee80211_power_rule *power_rule;
> +	const struct ieee80211_freq_range *freq_range;
> +	char max_antenna_gain[32];
> +
> +	power_rule = &reg_rule->power_rule;
> +	freq_range = &reg_rule->freq_range;
> +
> +	if (!power_rule->max_antenna_gain)
> +		snprintf(max_antenna_gain, 32, "N/A");
> +	else
> +		snprintf(max_antenna_gain, 32, "%d", power_rule->max_antenna_gain);
> +
> +	REG_DBG_PRINT("cfg80211: Updating information on frequency %d MHz "
> +		      "for %d a MHz width channel with regulatory rule:\n",
> +		      chan->center_freq,
> +		      KHZ_TO_MHZ(desired_bw_khz));
> +
> +	REG_DBG_PRINT("cfg80211: %d KHz - %d KHz @  KHz), (%s mBi, %d mBm)\n",
> +		      freq_range->start_freq_khz,
> +		      freq_range->end_freq_khz,
> +		      max_antenna_gain,
> +		      power_rule->max_eirp);
> +}
> +#else
> +static void reg_reg_rule_print_dbg(const struct ieee80211_reg_rule *reg_rule)
This will break compilation. Function name and arguments needs to be fixed here.
> +{
> +	return;
> +}
> +#endif
> +
>  /*
>   * Note that right now we assume the desired channel bandwidth
>   * is always 20 MHz for each individual channel (HT40 uses 20 MHz
> @@ -788,6 +824,8 @@ static void handle_channel(struct wiphy *wiphy,
>  		return;
>  	}
>  
> +	chan_reg_rule_print_dbg(chan, desired_bw_khz, reg_rule);
> +
>  	power_rule = &reg_rule->power_rule;
>  	freq_range = &reg_rule->freq_range;
>  
> @@ -1132,6 +1170,8 @@ static void handle_channel_custom(struct wiphy *wiphy,
>  		return;
>  	}
>  
> +	chan_reg_rule_print_dbg(chan, desired_bw_khz, reg_rule);
> +
>  	power_rule = &reg_rule->power_rule;
>  	freq_range = &reg_rule->freq_range;
>  
> -- 
> 1.7.0.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 6/7] cfg80211: add debug print when processing a channel

[Luis R. Rodriguez]

On Thu, Oct 21, 2010 at 01:18:28AM -0700, Senthilkumar Balasubramanian wrote:
> On Wed, Oct 20, 2010 at 10:48:58PM +0530, Luis R. Rodriguez wrote:
> > In the worst case you are seeing really odd things you want
> > more information than what is provided right now, for those
> > that insist and want debug info through CONFIG_CFG80211_REG_DEBUG
> > provide a print of when we are processing a channel and with what
> > regulatory rule.
> > 
> > Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
> > Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
> > ---
> >  net/wireless/reg.c |   40 ++++++++++++++++++++++++++++++++++++++++
> >  1 files changed, 40 insertions(+), 0 deletions(-)
> > 
> > diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> > index 62396b2..f0ff146 100644
> > --- a/net/wireless/reg.c
> > +++ b/net/wireless/reg.c
> > @@ -728,6 +728,42 @@ static const char *reg_initiator_name(enum nl80211_reg_initiator initiator)
> >  	}
> >  }
> >  
> > +#ifdef CONFIG_CFG80211_REG_DEBUG
> > +
> > +static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan,
> > +				    u32 desired_bw_khz,
> > +				    const struct ieee80211_reg_rule *reg_rule)
> > +{
> > +	const struct ieee80211_power_rule *power_rule;
> > +	const struct ieee80211_freq_range *freq_range;
> > +	char max_antenna_gain[32];
> > +
> > +	power_rule = &reg_rule->power_rule;
> > +	freq_range = &reg_rule->freq_range;
> > +
> > +	if (!power_rule->max_antenna_gain)
> > +		snprintf(max_antenna_gain, 32, "N/A");
> > +	else
> > +		snprintf(max_antenna_gain, 32, "%d", power_rule->max_antenna_gain);
> > +
> > +	REG_DBG_PRINT("cfg80211: Updating information on frequency %d MHz "
> > +		      "for %d a MHz width channel with regulatory rule:\n",
> > +		      chan->center_freq,
> > +		      KHZ_TO_MHZ(desired_bw_khz));
> > +
> > +	REG_DBG_PRINT("cfg80211: %d KHz - %d KHz @  KHz), (%s mBi, %d mBm)\n",
> > +		      freq_range->start_freq_khz,
> > +		      freq_range->end_freq_khz,
> > +		      max_antenna_gain,
> > +		      power_rule->max_eirp);
> > +}
> > +#else
> > +static void reg_reg_rule_print_dbg(const struct ieee80211_reg_rule *reg_rule)
> This will break compilation. Function name and arguments needs to be fixed here.

Good catch. I'll fix in the AM.

  Luis

Re: [PATCH 6/7] cfg80211: add debug print when processing a channel

[Luis R. Rodriguez]

On Thu, Oct 21, 2010 at 02:02:54AM -0700, Luis Rodriguez wrote:
> On Thu, Oct 21, 2010 at 01:18:28AM -0700, Senthilkumar Balasubramanian wrote:
> > On Wed, Oct 20, 2010 at 10:48:58PM +0530, Luis R. Rodriguez wrote:
> > > In the worst case you are seeing really odd things you want
> > > more information than what is provided right now, for those
> > > that insist and want debug info through CONFIG_CFG80211_REG_DEBUG
> > > provide a print of when we are processing a channel and with what
> > > regulatory rule.
> > > 
> > > Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
> > > Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
> > > ---
> > >  net/wireless/reg.c |   40 ++++++++++++++++++++++++++++++++++++++++
> > >  1 files changed, 40 insertions(+), 0 deletions(-)
> > > 
> > > diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> > > index 62396b2..f0ff146 100644
> > > --- a/net/wireless/reg.c
> > > +++ b/net/wireless/reg.c
> > > @@ -728,6 +728,42 @@ static const char *reg_initiator_name(enum nl80211_reg_initiator initiator)
> > >  	}
> > >  }
> > >  
> > > +#ifdef CONFIG_CFG80211_REG_DEBUG
> > > +
> > > +static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan,
> > > +				    u32 desired_bw_khz,
> > > +				    const struct ieee80211_reg_rule *reg_rule)
> > > +{
> > > +	const struct ieee80211_power_rule *power_rule;
> > > +	const struct ieee80211_freq_range *freq_range;
> > > +	char max_antenna_gain[32];
> > > +
> > > +	power_rule = &reg_rule->power_rule;
> > > +	freq_range = &reg_rule->freq_range;
> > > +
> > > +	if (!power_rule->max_antenna_gain)
> > > +		snprintf(max_antenna_gain, 32, "N/A");
> > > +	else
> > > +		snprintf(max_antenna_gain, 32, "%d", power_rule->max_antenna_gain);
> > > +
> > > +	REG_DBG_PRINT("cfg80211: Updating information on frequency %d MHz "
> > > +		      "for %d a MHz width channel with regulatory rule:\n",
> > > +		      chan->center_freq,
> > > +		      KHZ_TO_MHZ(desired_bw_khz));
> > > +
> > > +	REG_DBG_PRINT("cfg80211: %d KHz - %d KHz @  KHz), (%s mBi, %d mBm)\n",
> > > +		      freq_range->start_freq_khz,
> > > +		      freq_range->end_freq_khz,
> > > +		      max_antenna_gain,
> > > +		      power_rule->max_eirp);
> > > +}
> > > +#else
> > > +static void reg_reg_rule_print_dbg(const struct ieee80211_reg_rule *reg_rule)
> > This will break compilation. Function name and arguments needs to be fixed here.
> 
> Good catch. I'll fix in the AM.

BTW , feel free to fix my patches and resend :)

  Luis

[PATCH 7/7] cfg80211: prefix REG_DBG_PRINT() with cfg80211

[Luis R. Rodriguez]

Everyone's doing it, its the cool thing.

Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/wireless/reg.c |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index f0ff146..9b0b011 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -48,7 +48,7 @@
 #ifdef CONFIG_CFG80211_REG_DEBUG
 #define REG_DBG_PRINT(format, args...) \
 	do { \
-		printk(KERN_DEBUG format , ## args); \
+		printk(KERN_DEBUG "cfg80211: " format , ## args); \
 	} while (0)
 #else
 #define REG_DBG_PRINT(args...)
@@ -746,12 +746,12 @@ static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan,
 	else
 		snprintf(max_antenna_gain, 32, "%d", power_rule->max_antenna_gain);
 
-	REG_DBG_PRINT("cfg80211: Updating information on frequency %d MHz "
+	REG_DBG_PRINT("Updating information on frequency %d MHz "
 		      "for %d a MHz width channel with regulatory rule:\n",
 		      chan->center_freq,
 		      KHZ_TO_MHZ(desired_bw_khz));
 
-	REG_DBG_PRINT("cfg80211: %d KHz - %d KHz @  KHz), (%s mBi, %d mBm)\n",
+	REG_DBG_PRINT("%d KHz - %d KHz @  KHz), (%s mBi, %d mBm)\n",
 		      freq_range->start_freq_khz,
 		      freq_range->end_freq_khz,
 		      max_antenna_gain,
@@ -818,8 +818,7 @@ static void handle_channel(struct wiphy *wiphy,
 		    r == -ERANGE)
 			return;
 
-		REG_DBG_PRINT("cfg80211: Disabling freq %d MHz\n",
-			      chan->center_freq);
+		REG_DBG_PRINT("Disabling freq %d MHz\n", chan->center_freq);
 		chan->flags = IEEE80211_CHAN_DISABLED;
 		return;
 	}
@@ -877,7 +876,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
 			      enum nl80211_reg_initiator initiator)
 {
 	if (!last_request) {
-		REG_DBG_PRINT("cfg80211: Ignoring regulatory request %s since "
+		REG_DBG_PRINT("Ignoring regulatory request %s since "
 			      "last_request is not set\n",
 			      reg_initiator_name(initiator));
 		return true;
@@ -885,7 +884,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
 
 	if (initiator == NL80211_REGDOM_SET_BY_CORE &&
 	    wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) {
-		REG_DBG_PRINT("cfg80211: Ignoring regulatory request %s "
+		REG_DBG_PRINT("Ignoring regulatory request %s "
 			      "since the driver uses its own custom "
 			      "regulatory domain ",
 			      reg_initiator_name(initiator));
@@ -899,7 +898,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
 	if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !wiphy->regd &&
 	    initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
 	    !is_world_regdom(last_request->alpha2)) {
-		REG_DBG_PRINT("cfg80211: Ignoring regulatory request %s "
+		REG_DBG_PRINT("Ignoring regulatory request %s "
 			      "since the driver requires its own regulaotry "
 			      "domain to be set first",
 			      reg_initiator_name(initiator));
@@ -1161,7 +1160,7 @@ static void handle_channel_custom(struct wiphy *wiphy,
 			       regd);
 
 	if (r) {
-		REG_DBG_PRINT("cfg80211: Disabling freq %d MHz as custom "
+		REG_DBG_PRINT("Disabling freq %d MHz as custom "
 			      "regd has no rule that fits a %d MHz "
 			      "wide channel\n",
 			      chan->center_freq,
@@ -1661,7 +1660,7 @@ static void restore_alpha2(char *alpha2, bool reset_user)
 	if (is_user_regdom_saved()) {
 		/* Unless we're asked to ignore it and reset it */
 		if (reset_user) {
-			REG_DBG_PRINT("cfg80211: Restoring regulatory settings "
+			REG_DBG_PRINT("Restoring regulatory settings "
 			       "including user preference\n");
 			user_alpha2[0] = '9';
 			user_alpha2[1] = '7';
@@ -1672,7 +1671,7 @@ static void restore_alpha2(char *alpha2, bool reset_user)
 			 * back as they were for a full restore.
 			 */
 			if (!is_world_regdom(ieee80211_regdom)) {
-				REG_DBG_PRINT("cfg80211: Keeping preference on "
+				REG_DBG_PRINT("Keeping preference on "
 				       "module parameter ieee80211_regdom: %c%c\n",
 				       ieee80211_regdom[0],
 				       ieee80211_regdom[1]);
@@ -1680,7 +1679,7 @@ static void restore_alpha2(char *alpha2, bool reset_user)
 				alpha2[1] = ieee80211_regdom[1];
 			}
 		} else {
-			REG_DBG_PRINT("cfg80211: Restoring regulatory settings "
+			REG_DBG_PRINT("Restoring regulatory settings "
 			       "while preserving user preference for: %c%c\n",
 			       user_alpha2[0],
 			       user_alpha2[1]);
@@ -1688,14 +1687,14 @@ static void restore_alpha2(char *alpha2, bool reset_user)
 			alpha2[1] = user_alpha2[1];
 		}
 	} else if (!is_world_regdom(ieee80211_regdom)) {
-		REG_DBG_PRINT("cfg80211: Keeping preference on "
+		REG_DBG_PRINT("Keeping preference on "
 		       "module parameter ieee80211_regdom: %c%c\n",
 		       ieee80211_regdom[0],
 		       ieee80211_regdom[1]);
 		alpha2[0] = ieee80211_regdom[0];
 		alpha2[1] = ieee80211_regdom[1];
 	} else
-		REG_DBG_PRINT("cfg80211: Restoring regulatory settings\n");
+		REG_DBG_PRINT("Restoring regulatory settings\n");
 }
 
 /*
@@ -1763,7 +1762,7 @@ static void restore_regulatory_settings(bool reset_user)
 
 void regulatory_hint_disconnect(void)
 {
-	REG_DBG_PRINT("cfg80211: All devices are disconnected, going to "
+	REG_DBG_PRINT("All devices are disconnected, going to "
 		      "restore regulatory settings\n");
 	restore_regulatory_settings(false);
 }
@@ -1793,7 +1792,7 @@ int regulatory_hint_found_beacon(struct wiphy *wiphy,
 	if (!reg_beacon)
 		return -ENOMEM;
 
-	REG_DBG_PRINT("cfg80211: Found new beacon on "
+	REG_DBG_PRINT("Found new beacon on "
 		      "frequency: %d MHz (Ch %d) on %s\n",
 		      beacon_chan->center_freq,
 		      ieee80211_frequency_to_channel(beacon_chan->center_freq),
-- 
1.7.0.4