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

Commit 1a5e6326 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: remove IS_CHAN_B() 



Hardware 802.11b-only mode isn't supported by the driver (the device is
configured for 802.11n/g instead). Simplify the code by removing checks
for it.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8896934c

drivers/net/wireless/ath/ath9k/ar5008_phy.c

+4 −2
Original line number Diff line number Diff line
@@ -794,8 +794,10 @@ static void ar5008_hw_set_rfmode(struct ath_hw *ah, struct ath9k_channel *chan) 
	if (chan == NULL)

		return;



	rfMode |= (IS_CHAN_B(chan) || IS_CHAN_G(chan))

		? AR_PHY_MODE_DYNAMIC : AR_PHY_MODE_OFDM;

	if (IS_CHAN_2GHZ(chan))

		rfMode |= AR_PHY_MODE_DYNAMIC;

	else

		rfMode |= AR_PHY_MODE_OFDM;



	if (!AR_SREV_9280_20_OR_LATER(ah))

		rfMode |= (IS_CHAN_5GHZ(chan)) ?

drivers/net/wireless/ath/ath9k/ar9002_calib.c

+2 −5
Original line number Diff line number Diff line
@@ -33,15 +33,12 @@ static bool ar9002_hw_is_cal_supported(struct ath_hw *ah, 
	bool supported = false;

	switch (ah->supp_cals & cal_type) {

	case IQ_MISMATCH_CAL:

		/* Run IQ Mismatch for non-CCK only */

		if (!IS_CHAN_B(chan))

		supported = true;

		break;

	case ADC_GAIN_CAL:

	case ADC_DC_CAL:

		/* Run ADC Gain Cal for non-CCK & non 2GHz-HT20 only */

		if (!IS_CHAN_B(chan) &&

		    !((IS_CHAN_2GHZ(chan) || IS_CHAN_A_FAST_CLOCK(ah, chan)) &&

		if (!((IS_CHAN_2GHZ(chan) || IS_CHAN_A_FAST_CLOCK(ah, chan)) &&

		      IS_CHAN_HT20(chan)))

			supported = true;

		break;

drivers/net/wireless/ath/ath9k/ar9003_phy.c

+4 −2
Original line number Diff line number Diff line
@@ -808,8 +808,10 @@ static void ar9003_hw_set_rfmode(struct ath_hw *ah, 
	if (chan == NULL)

		return;



	rfMode |= (IS_CHAN_B(chan) || IS_CHAN_G(chan))

		? AR_PHY_MODE_DYNAMIC : AR_PHY_MODE_OFDM;

	if (IS_CHAN_2GHZ(chan))

		rfMode |= AR_PHY_MODE_DYNAMIC;

	else

		rfMode |= AR_PHY_MODE_OFDM;



	if (IS_CHAN_A_FAST_CLOCK(ah, chan))

		rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE);

drivers/net/wireless/ath/ath9k/hw.c

+2 −7
Original line number Diff line number Diff line
@@ -190,9 +190,6 @@ EXPORT_SYMBOL(ath9k_hw_wait); 
void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,

			  int hw_delay)

{

	if (IS_CHAN_B(chan))

		hw_delay = (4 * hw_delay) / 22;

	else

	hw_delay /= 10;



	if (IS_CHAN_HALF_RATE(chan))
@@ -1159,9 +1156,7 @@ u32 ath9k_regd_get_ctl(struct ath_regulatory *reg, struct ath9k_channel *chan) 
{

	u32 ctl = ath_regd_get_band_ctl(reg, chan->chan->band);



	if (IS_CHAN_B(chan))

		ctl |= CTL_11B;

	else if (IS_CHAN_G(chan))

	if (IS_CHAN_G(chan))

		ctl |= CTL_11G;

	else

		ctl |= CTL_11A;

drivers/net/wireless/ath/ath9k/hw.h

+0 −1
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ struct ath9k_channel { 
	 ((_ah)->caps.hw_caps & ATH9K_HW_CAP_FASTCLOCK))



/* These macros check chanmode and not channelFlags */

#define IS_CHAN_B(_c) ((_c)->chanmode == CHANNEL_B)

#define IS_CHAN_HT20(_c) (((_c)->chanmode == CHANNEL_A_HT20) ||	\

			  ((_c)->chanmode == CHANNEL_G_HT20))

#define IS_CHAN_HT40(_c) (((_c)->chanmode == CHANNEL_A_HT40PLUS) ||	\