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

Commit 06855ef4 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Let RF chipset decide the RF channel switch method to use in rt2800. 



It seems that the distinction between RF channel switch method is solely based
on the RF chipset that is used.
Refactor the channel switch decision to just take the RF chipset into account,
thereby greatly simplifying the check.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5988f385

drivers/net/wireless/rt2x00/rt2800lib.c

+14 −17
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static void rt2800_config_lna_gain(struct rt2x00_dev *rt2x00dev, 
	rt2x00dev->lna_gain = lna_gain;

}



static void rt2800_config_channel_rt2x(struct rt2x00_dev *rt2x00dev,

static void rt2800_config_channel_rf2xxx(struct rt2x00_dev *rt2x00dev,

					 struct ieee80211_conf *conf,

					 struct rf_channel *rf,

					 struct channel_info *info)
@@ -786,7 +786,7 @@ static void rt2800_config_channel_rt2x(struct rt2x00_dev *rt2x00dev, 
	rt2800_rf_write(rt2x00dev, 4, rf->rf4);

}



static void rt2800_config_channel_rt3x(struct rt2x00_dev *rt2x00dev,

static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev,

					 struct ieee80211_conf *conf,

					 struct rf_channel *rf,

					 struct channel_info *info)
@@ -826,16 +826,13 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, 
	unsigned int tx_pin;

	u8 bbp;



	if ((rt2x00_rt(rt2x00dev, RT3070) ||

	     rt2x00_rt(rt2x00dev, RT3090) ||

	     rt2x00_rt(rt2x00dev, RT2872)) &&

	    (rt2x00_rf(rt2x00dev, RF2020) ||

	if (rt2x00_rf(rt2x00dev, RF2020) ||

	    rt2x00_rf(rt2x00dev, RF3020) ||

	    rt2x00_rf(rt2x00dev, RF3021) ||

	     rt2x00_rf(rt2x00dev, RF3022)))

		rt2800_config_channel_rt3x(rt2x00dev, conf, rf, info);

	    rt2x00_rf(rt2x00dev, RF3022))

		rt2800_config_channel_rf3xxx(rt2x00dev, conf, rf, info);

	else

		rt2800_config_channel_rt2x(rt2x00dev, conf, rf, info);

		rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);



	/*

	 * Change BBP settings