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

Commit f6688cd8 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Remove remaining occurrences of CONFIG_SLOW_ANT_DIV 



Slow Antenna Diversity has been removed, these are remnants
of the old code.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 817e11de

drivers/net/wireless/ath9k/core.h

+0 −3
Original line number Diff line number Diff line
@@ -715,9 +715,6 @@ struct ath_softc { 
	enum ath9k_ht_extprotspacing sc_ht_extprotspacing;

	enum ath9k_ht_macmode tx_chan_width;



#ifdef CONFIG_SLOW_ANT_DIV

	struct ath_antdiv sc_antdiv;

#endif

	enum {

		OK,		/* no change needed */

		UPDATE,		/* update pending */

drivers/net/wireless/ath9k/hw.c

+2 −11
Original line number Diff line number Diff line
@@ -640,10 +640,7 @@ static struct ath_hal *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc, 
	struct ath_hal_5416 *ahp;

	struct ath_hal *ah;

	int ecode;

#ifndef CONFIG_SLOW_ANT_DIV

	u32 i;

	u32 j;

#endif

	u32 i, j;



	ahp = ath9k_hw_newstate(devid, sc, mem, status);

	if (ahp == NULL)
@@ -853,7 +850,6 @@ static struct ath_hal *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc, 
	if (AR_SREV_9280_20_OR_LATER(ah))

		ath9k_hw_init_txgain_ini(ah);



#ifndef CONFIG_SLOW_ANT_DIV

	if (ah->ah_devid == AR9280_DEVID_PCI) {

		for (i = 0; i < ahp->ah_iniModes.ia_rows; i++) {

			u32 reg = INI_RA(&ahp->ah_iniModes, i, 0);
@@ -867,7 +863,7 @@ static struct ath_hal *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc, 
			}

		}

	}

#endif



	if (!ath9k_hw_fill_cap_info(ah)) {

		DPRINTF(ah->ah_sc, ATH_DBG_RESET,

			"failed ath9k_hw_fill_cap_info\n");
@@ -1294,11 +1290,6 @@ static int ath9k_hw_process_ini(struct ath_hal *ah, 
		u32 reg = INI_RA(&ahp->ah_iniModes, i, 0);

		u32 val = INI_RA(&ahp->ah_iniModes, i, modesIndex);



#ifdef CONFIG_SLOW_ANT_DIV

		if (ah->ah_devid == AR9280_DEVID_PCI)

			val = ath9k_hw_ini_fixup(ah, &ahp->ah_eeprom, reg, val);

#endif



		REG_WRITE(ah, reg, val);



		if (reg >= 0x7800 && reg < 0x78a0

drivers/net/wireless/ath9k/main.c

+0 −8
Original line number Diff line number Diff line
@@ -1513,11 +1513,6 @@ static int ath_init(u16 devid, struct ath_softc *sc) 
	/* save MISC configurations */

	sc->sc_config.swBeaconProcess = 1;



#ifdef CONFIG_SLOW_ANT_DIV

	/* range is 40 - 255, we use something in the middle */

	ath_slow_ant_div_init(&sc->sc_antdiv, sc, 0x127);

#endif



	/* setup channels and rates */



	sc->sbands[IEEE80211_BAND_2GHZ].channels =
@@ -2129,9 +2124,6 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, 


	DPRINTF(sc, ATH_DBG_CONFIG, "Detach Interface\n");



#ifdef CONFIG_SLOW_ANT_DIV

	ath_slow_ant_div_stop(&sc->sc_antdiv);

#endif

	/* Stop ANI */

	del_timer_sync(&sc->sc_ani.timer);