mac80211: remove max_bandwidth
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> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
1afcfd54fd
commit
d5b96a6f39
|
@ -80,7 +80,6 @@ enum ieee80211_channel_flags {
|
||||||
* with cfg80211.
|
* with cfg80211.
|
||||||
*
|
*
|
||||||
* @center_freq: center frequency in MHz
|
* @center_freq: center frequency in MHz
|
||||||
* @max_bandwidth: maximum allowed bandwidth for this channel, in MHz
|
|
||||||
* @hw_value: hardware-specific value for the channel
|
* @hw_value: hardware-specific value for the channel
|
||||||
* @flags: channel flags from &enum ieee80211_channel_flags.
|
* @flags: channel flags from &enum ieee80211_channel_flags.
|
||||||
* @orig_flags: channel flags at registration time, used by regulatory
|
* @orig_flags: channel flags at registration time, used by regulatory
|
||||||
|
@ -97,7 +96,6 @@ enum ieee80211_channel_flags {
|
||||||
struct ieee80211_channel {
|
struct ieee80211_channel {
|
||||||
enum ieee80211_band band;
|
enum ieee80211_band band;
|
||||||
u16 center_freq;
|
u16 center_freq;
|
||||||
u8 max_bandwidth;
|
|
||||||
u16 hw_value;
|
u16 hw_value;
|
||||||
u32 flags;
|
u32 flags;
|
||||||
int max_antenna_gain;
|
int max_antenna_gain;
|
||||||
|
|
|
@ -1018,7 +1018,6 @@ static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
|
||||||
map_regdom_flags(reg_rule->flags) | bw_flags;
|
map_regdom_flags(reg_rule->flags) | bw_flags;
|
||||||
chan->max_antenna_gain = chan->orig_mag =
|
chan->max_antenna_gain = chan->orig_mag =
|
||||||
(int) MBI_TO_DBI(power_rule->max_antenna_gain);
|
(int) MBI_TO_DBI(power_rule->max_antenna_gain);
|
||||||
chan->max_bandwidth = KHZ_TO_MHZ(desired_bw_khz);
|
|
||||||
chan->max_power = chan->orig_mpwr =
|
chan->max_power = chan->orig_mpwr =
|
||||||
(int) MBM_TO_DBM(power_rule->max_eirp);
|
(int) MBM_TO_DBM(power_rule->max_eirp);
|
||||||
return;
|
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->flags = flags | bw_flags | map_regdom_flags(reg_rule->flags);
|
||||||
chan->max_antenna_gain = min(chan->orig_mag,
|
chan->max_antenna_gain = min(chan->orig_mag,
|
||||||
(int) MBI_TO_DBI(power_rule->max_antenna_gain));
|
(int) MBI_TO_DBI(power_rule->max_antenna_gain));
|
||||||
chan->max_bandwidth = KHZ_TO_MHZ(desired_bw_khz);
|
|
||||||
if (chan->orig_mpwr)
|
if (chan->orig_mpwr)
|
||||||
chan->max_power = min(chan->orig_mpwr,
|
chan->max_power = min(chan->orig_mpwr,
|
||||||
(int) MBM_TO_DBM(power_rule->max_eirp));
|
(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->flags |= map_regdom_flags(reg_rule->flags) | bw_flags;
|
||||||
chan->max_antenna_gain = (int) MBI_TO_DBI(power_rule->max_antenna_gain);
|
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);
|
chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue