| Message ID | 1249768399-16855-1-git-send-email-pat-lkml@erley.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
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); > } >
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); }
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> --- include/net/cfg80211.h | 2 -- net/wireless/reg.c | 3 --- 2 files changed, 0 insertions(+), 5 deletions(-)