diff options
author | Pat Erley <pat-lkml@erley.org> | 2009-08-08 17:53:19 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:13:53 -0400 |
commit | d5b96a6f39a8aaa7534069b3db71048df44f023b (patch) | |
tree | f02b5a32440794d33b6a18ea78a491ede05cb061 /net | |
parent | 1afcfd54fdf913017c07fa1ee497141a7958991d (diff) |
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/reg.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 0f61ae613f3b..fc7a4849c990 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, | |||
1018 | map_regdom_flags(reg_rule->flags) | bw_flags; | 1018 | map_regdom_flags(reg_rule->flags) | bw_flags; |
1019 | chan->max_antenna_gain = chan->orig_mag = | 1019 | chan->max_antenna_gain = chan->orig_mag = |
1020 | (int) MBI_TO_DBI(power_rule->max_antenna_gain); | 1020 | (int) MBI_TO_DBI(power_rule->max_antenna_gain); |
1021 | chan->max_bandwidth = KHZ_TO_MHZ(desired_bw_khz); | ||
1022 | chan->max_power = chan->orig_mpwr = | 1021 | chan->max_power = chan->orig_mpwr = |
1023 | (int) MBM_TO_DBM(power_rule->max_eirp); | 1022 | (int) MBM_TO_DBM(power_rule->max_eirp); |
1024 | return; | 1023 | return; |
@@ -1027,7 +1026,6 @@ static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band, | |||
1027 | chan->flags = flags | bw_flags | map_regdom_flags(reg_rule->flags); | 1026 | chan->flags = flags | bw_flags | map_regdom_flags(reg_rule->flags); |
1028 | chan->max_antenna_gain = min(chan->orig_mag, | 1027 | chan->max_antenna_gain = min(chan->orig_mag, |
1029 | (int) MBI_TO_DBI(power_rule->max_antenna_gain)); | 1028 | (int) MBI_TO_DBI(power_rule->max_antenna_gain)); |
1030 | chan->max_bandwidth = KHZ_TO_MHZ(desired_bw_khz); | ||
1031 | if (chan->orig_mpwr) | 1029 | if (chan->orig_mpwr) |
1032 | chan->max_power = min(chan->orig_mpwr, | 1030 | chan->max_power = min(chan->orig_mpwr, |
1033 | (int) MBM_TO_DBM(power_rule->max_eirp)); | 1031 | (int) MBM_TO_DBM(power_rule->max_eirp)); |
@@ -1329,7 +1327,6 @@ static void handle_channel_custom(struct wiphy *wiphy, | |||
1329 | 1327 | ||
1330 | chan->flags |= map_regdom_flags(reg_rule->flags) | bw_flags; | 1328 | chan->flags |= map_regdom_flags(reg_rule->flags) | bw_flags; |
1331 | chan->max_antenna_gain = (int) MBI_TO_DBI(power_rule->max_antenna_gain); | 1329 | chan->max_antenna_gain = (int) MBI_TO_DBI(power_rule->max_antenna_gain); |
1332 | chan->max_bandwidth = KHZ_TO_MHZ(desired_bw_khz); | ||
1333 | chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp); | 1330 | chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp); |
1334 | } | 1331 | } |
1335 | 1332 | ||