Commit 15ec51b2 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

rt2x00: save conf settings before reset tuner 



Reset tuner use curr_band value, make sure it is updated.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent cfe82fbd

drivers/net/wireless/ralink/rt2x00/rt2x00config.c

+16 −16
Original line number Diff line number Diff line
@@ -249,6 +249,22 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 
	 */

	rt2x00dev->ops->lib->config(rt2x00dev, &libconf, ieee80211_flags);



	if (conf->flags & IEEE80211_CONF_PS)

		set_bit(CONFIG_POWERSAVING, &rt2x00dev->flags);

	else

		clear_bit(CONFIG_POWERSAVING, &rt2x00dev->flags);



	if (conf->flags & IEEE80211_CONF_MONITOR)

		set_bit(CONFIG_MONITORING, &rt2x00dev->flags);

	else

		clear_bit(CONFIG_MONITORING, &rt2x00dev->flags);



	rt2x00dev->curr_band = conf->chandef.chan->band;

	rt2x00dev->curr_freq = conf->chandef.chan->center_freq;

	rt2x00dev->tx_power = conf->power_level;

	rt2x00dev->short_retry = conf->short_frame_max_tx_count;

	rt2x00dev->long_retry = conf->long_frame_max_tx_count;



	/*

	 * Some configuration changes affect the link quality

	 * which means we need to reset the link tuner.
@@ -271,20 +287,4 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 
				   &rt2x00dev->autowakeup_work,

				   autowake_timeout - 15);

	}



	if (conf->flags & IEEE80211_CONF_PS)

		set_bit(CONFIG_POWERSAVING, &rt2x00dev->flags);

	else

		clear_bit(CONFIG_POWERSAVING, &rt2x00dev->flags);



	if (conf->flags & IEEE80211_CONF_MONITOR)

		set_bit(CONFIG_MONITORING, &rt2x00dev->flags);

	else

		clear_bit(CONFIG_MONITORING, &rt2x00dev->flags);



	rt2x00dev->curr_band = conf->chandef.chan->band;

	rt2x00dev->curr_freq = conf->chandef.chan->center_freq;

	rt2x00dev->tx_power = conf->power_level;

	rt2x00dev->short_retry = conf->short_frame_max_tx_count;

	rt2x00dev->long_retry = conf->long_frame_max_tx_count;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE