Commit e30eb4ab authored by Joerg Albert's avatar Joerg Albert Committed by John W. Linville
Browse files

ath5k: fix missing output in monitor mode after ifconfig up 



Let ath5k_chan_set() always call ath5k_reset().
This fixes the bug that we don't
get any packets in monitor mode after:

ifconfig wlan0 down
iwconfig wlan0 mode monitor channel 1
ifconfig wlan0 up

but they arrive after

iwconfig wlan0 channel 2

Signed-off-by: default avatarJoerg Albert <jal2@gmx.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c458bc50

drivers/net/wireless/ath/ath5k/base.c

+15 −20
Original line number Diff line number Diff line
@@ -1071,10 +1071,9 @@ ath5k_setup_bands(struct ieee80211_hw *hw) 
}



/*

 * Set/change channels.  If the channel is really being changed,

 * it's done by reseting the chip.  To accomplish this we must

 * first cleanup any pending DMA, then restart stuff after a la

 * ath5k_init.

 * Set/change channels. We always reset the chip.

 * To accomplish this we must first cleanup any pending DMA,

 * then restart stuff after a la  ath5k_init.

 *

 * Called with sc->lock.

 */
@@ -1084,9 +1083,6 @@ ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan) 
	ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "(%u MHz) -> (%u MHz)\n",

		sc->curchan->center_freq, chan->center_freq);



	if (chan->center_freq != sc->curchan->center_freq ||

		chan->hw_value != sc->curchan->hw_value) {



	/*

	 * To switch channels clear any pending DMA operations;

	 * wait long enough for the RX fifo to drain, reset the
@@ -1096,9 +1092,6 @@ ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan) 
	return ath5k_reset(sc, chan);

}



	return 0;

}



static void

ath5k_setcurmode(struct ath5k_softc *sc, unsigned int mode)

{
@@ -2811,9 +2804,11 @@ ath5k_config(struct ieee80211_hw *hw, u32 changed) 


	mutex_lock(&sc->lock);



	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {

		ret = ath5k_chan_set(sc, conf->channel);

		if (ret < 0)

			goto unlock;

	}



	if ((changed & IEEE80211_CONF_CHANGE_POWER) &&

	(sc->power_level != conf->power_level)) {