Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5b96a6f authored by Pat Erley's avatar Pat Erley Committed by John W. Linville
Browse files

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: default avatarPat Erley <pat-lkml@erley.org>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1afcfd54

include/net/cfg80211.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

net/wireless/reg.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

}