Commit c0d7c7af authored Dec 23, 2008 by Luis R. Rodriguez Committed by John W. Linville Jan 29, 2009

ath9k: remove superfluous check on changing channel



When we try to change the channel in ath9k its because
either the configuration indicates we *have* changed
channels or HT configuration has changed. In both cases
we want to do a reset. Either way mac80211 will inform us
when we want to actually change the channel so trust those
calls.

Although in the patch it may seem as I am doing more code
changes I am not, all I am doing is removing the initial
branch conditional and shifting the code to the left.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 0de57d99

drivers/net/wireless/ath9k/main.c

+41 −46

Original line number	Diff line number	Diff line
		@@ -268,10 +268,6 @@ static int ath_set_channel(struct ath_softc sc, struct ath9k_channel hchan)
		if (sc->sc_flags & SC_OP_INVALID)
		return -EIO;

		if (hchan->channel != sc->sc_ah->ah_curchan->channel \|\|
		hchan->channelFlags != sc->sc_ah->ah_curchan->channelFlags \|\|
		(sc->sc_flags & SC_OP_CHAINMASK_UPDATE) \|\|
		(sc->sc_flags & SC_OP_FULL_RESET)) {
		/*
		* This is only performed if the channel settings have
		* actually changed.
		@@ -322,7 +318,6 @@ static int ath_set_channel(struct ath_softc sc, struct ath9k_channel hchan)
		ath_cache_conf_rate(sc, &hw->conf);
		ath_update_txpow(sc);
		ath9k_hw_set_interrupts(ah, sc->sc_imask);
		}
		return 0;
		}