linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: Pat Erley <pat-lkml@erley.org>
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH] mac80211: remove max_bandwidth
Date: Sun, 09 Aug 2009 00:53:54 +0200	[thread overview]
Message-ID: <1249772034.4636.0.camel@johannes.local> (raw)
In-Reply-To: <1249768399-16855-1-git-send-email-pat-lkml@erley.org>

[-- Attachment #1: Type: text/plain, Size: 2595 bytes --]

On Sat, 2009-08-08 at 17:53 -0400, Pat Erley wrote:
> This removes the max_bandwidth attribute.  It is only ever
> written to, and is duplicated by max_bandwidth_khz in the
> regulatory code.
> 
> Signed-off-by: Pat Erley <pat-lkml@erley.org>

Acked-by: Johannes Berg <johannes@sipsolutions.net>

> ---
>  include/net/cfg80211.h |    2 --
>  net/wireless/reg.c     |    3 ---
>  2 files changed, 0 insertions(+), 5 deletions(-)
> 
> diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
> index d5756c9..2239134 100644
> --- a/include/net/cfg80211.h
> +++ b/include/net/cfg80211.h
> @@ -80,7 +80,6 @@ enum ieee80211_channel_flags {
>   * with cfg80211.
>   *
>   * @center_freq: center frequency in MHz
> - * @max_bandwidth: maximum allowed bandwidth for this channel, in MHz
>   * @hw_value: hardware-specific value for the channel
>   * @flags: channel flags from &enum ieee80211_channel_flags.
>   * @orig_flags: channel flags at registration time, used by regulatory
> @@ -97,7 +96,6 @@ enum ieee80211_channel_flags {
>  struct ieee80211_channel {
>  	enum ieee80211_band band;
>  	u16 center_freq;
> -	u8 max_bandwidth;
>  	u16 hw_value;
>  	u32 flags;
>  	int max_antenna_gain;
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index 0f61ae6..fc7a484 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -1018,7 +1018,6 @@ static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
>  			map_regdom_flags(reg_rule->flags) | bw_flags;
>  		chan->max_antenna_gain = chan->orig_mag =
>  			(int) MBI_TO_DBI(power_rule->max_antenna_gain);
> -		chan->max_bandwidth = KHZ_TO_MHZ(desired_bw_khz);
>  		chan->max_power = chan->orig_mpwr =
>  			(int) MBM_TO_DBM(power_rule->max_eirp);
>  		return;
> @@ -1027,7 +1026,6 @@ static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
>  	chan->flags = flags | bw_flags | map_regdom_flags(reg_rule->flags);
>  	chan->max_antenna_gain = min(chan->orig_mag,
>  		(int) MBI_TO_DBI(power_rule->max_antenna_gain));
> -	chan->max_bandwidth = KHZ_TO_MHZ(desired_bw_khz);
>  	if (chan->orig_mpwr)
>  		chan->max_power = min(chan->orig_mpwr,
>  			(int) MBM_TO_DBM(power_rule->max_eirp));
> @@ -1329,7 +1327,6 @@ static void handle_channel_custom(struct wiphy *wiphy,
>  
>  	chan->flags |= map_regdom_flags(reg_rule->flags) | bw_flags;
>  	chan->max_antenna_gain = (int) MBI_TO_DBI(power_rule->max_antenna_gain);
> -	chan->max_bandwidth = KHZ_TO_MHZ(desired_bw_khz);
>  	chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp);
>  }
>  


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

      reply	other threads:[~2009-08-08 22:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-08 21:53 [PATCH] mac80211: remove max_bandwidth Pat Erley
2009-08-08 22:53 ` Johannes Berg [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1249772034.4636.0.camel@johannes.local \
    --to=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=pat-lkml@erley.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).