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

Commit d97809db authored by Colin McCabe's avatar Colin McCabe Committed by John W. Linville
Browse files

ath9k: Replace ath9k_opmode with nl80211_iftype 



This patch kills ath9k's ath9k_opmode enum by replacing it with nl80211_iftype.

Signed-off-by: default avatarColin McCabe <colin@cozybit.com>
Signed-off-by: default avatarAndrey Yurovsky <andrey@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 33fd8195

drivers/net/wireless/ath9k/ani.c

+6 −6
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hal *ah) 
		}

	}



	if (ah->ah_opmode == ATH9K_M_HOSTAP) {

	if (ah->ah_opmode == NL80211_IFTYPE_AP) {

		if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {

			ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,

					     aniState->firstepLevel + 1);
@@ -368,7 +368,7 @@ static void ath9k_hw_ani_cck_err_trigger(struct ath_hal *ah) 
			return;

		}

	}

	if (ah->ah_opmode == ATH9K_M_HOSTAP) {

	if (ah->ah_opmode == NL80211_IFTYPE_AP) {

		if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {

			ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,

					     aniState->firstepLevel + 1);
@@ -398,7 +398,7 @@ static void ath9k_hw_ani_lower_immunity(struct ath_hal *ah) 


	aniState = ahp->ah_curani;



	if (ah->ah_opmode == ATH9K_M_HOSTAP) {

	if (ah->ah_opmode == NL80211_IFTYPE_AP) {

		if (aniState->firstepLevel > 0) {

			if (ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,

						 aniState->firstepLevel - 1))
@@ -487,8 +487,8 @@ void ath9k_ani_reset(struct ath_hal *ah) 
	aniState = &ahp->ah_ani[index];

	ahp->ah_curani = aniState;



	if (DO_ANI(ah) && ah->ah_opmode != ATH9K_M_STA

	    && ah->ah_opmode != ATH9K_M_IBSS) {

	if (DO_ANI(ah) && ah->ah_opmode != NL80211_IFTYPE_STATION

	    && ah->ah_opmode != NL80211_IFTYPE_ADHOC) {

		DPRINTF(ah->ah_sc, ATH_DBG_ANI,

			"Reset ANI state opmode %u\n", ah->ah_opmode);

		ahp->ah_stats.ast_ani_reset++;
@@ -504,7 +504,7 @@ void ath9k_ani_reset(struct ath_hal *ah) 
		ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) |

				     ATH9K_RX_FILTER_PHYERR);



		if (ah->ah_opmode == ATH9K_M_HOSTAP) {

		if (ah->ah_opmode == NL80211_IFTYPE_AP) {

			ahp->ah_curani->ofdmTrigHigh =

				ah->ah_config.ofdm_trig_high;

			ahp->ah_curani->ofdmTrigLow =

drivers/net/wireless/ath9k/ath9k.h

+2 −8
Original line number Diff line number Diff line
@@ -647,13 +647,6 @@ enum ath9k_ant_setting { 
	ATH9K_ANT_FIXED_B

};



enum ath9k_opmode {

	ATH9K_M_STA = 1,

	ATH9K_M_IBSS = 0,

	ATH9K_M_HOSTAP = 6,

	ATH9K_M_MONITOR = 8

};



#define ATH9K_SLOT_TIME_6 6

#define ATH9K_SLOT_TIME_9 9

#define ATH9K_SLOT_TIME_20 20
@@ -780,7 +773,8 @@ struct ath_hal { 


	void __iomem *ah_sh;

	struct ath_softc *ah_sc;

	enum ath9k_opmode ah_opmode;



	enum nl80211_iftype ah_opmode;

	struct ath9k_ops_config ah_config;

	struct ath9k_hw_capabilities ah_caps;

drivers/net/wireless/ath9k/beacon.c

+12 −12
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static int ath_beaconq_config(struct ath_softc *sc) 
	struct ath9k_tx_queue_info qi;



	ath9k_hw_get_txq_props(ah, sc->sc_bhalq, &qi);

	if (sc->sc_ah->ah_opmode == ATH9K_M_HOSTAP) {

	if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_AP) {

		/* Always burst out beacon and CAB traffic. */

		qi.tqi_aifs = 1;

		qi.tqi_cwmin = 0;
@@ -82,7 +82,7 @@ static void ath_beacon_setup(struct ath_softc *sc, 


	flags = ATH9K_TXDESC_NOACK;



	if (sc->sc_ah->ah_opmode == ATH9K_M_IBSS &&

	if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_ADHOC &&

	    (ah->ah_caps.hw_caps & ATH9K_HW_CAP_VEOL)) {

		ds->ds_link = bf->bf_daddr; /* self-linked */

		flags |= ATH9K_TXDESC_VEOL;
@@ -302,7 +302,7 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id) 
						 struct ath_buf, list);

		list_del(&avp->av_bcbuf->list);



		if (sc->sc_ah->ah_opmode == ATH9K_M_HOSTAP ||

		if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_AP ||

		    !(sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_VEOL)) {

			int slot;

			/*
@@ -607,16 +607,16 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
	struct ath_hal *ah = sc->sc_ah;

	struct ath_beacon_config conf;

	struct ath_vap *avp;

	enum ath9k_opmode av_opmode;

	enum nl80211_iftype opmode;

	u32 nexttbtt, intval;



	if (if_id != ATH_IF_ID_ANY) {

		vif = sc->sc_vaps[if_id];

		ASSERT(vif);

		avp = (void *)vif->drv_priv;

		av_opmode = avp->av_opmode;

		opmode = avp->av_opmode;

	} else {

		av_opmode = sc->sc_ah->ah_opmode;

		opmode = sc->sc_ah->ah_opmode;

	}



	memset(&conf, 0, sizeof(struct ath_beacon_config));
@@ -632,7 +632,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
	nexttbtt = TSF_TO_TU(sc->bc_tstamp >> 32, sc->bc_tstamp);



	/* XXX conditionalize multi-bss support? */

	if (sc->sc_ah->ah_opmode == ATH9K_M_HOSTAP) {

	if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_AP) {

		/*

		 * For multi-bss ap support beacons are either staggered

		 * evenly over N slots or burst together.  For the former
@@ -654,8 +654,8 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
	DPRINTF(sc, ATH_DBG_BEACON, "nexttbtt %u intval %u (%u)\n",

		nexttbtt, intval, conf.beacon_interval);



	/* Check for ATH9K_M_HOSTAP and sc_nostabeacons for WDS client */

	if (sc->sc_ah->ah_opmode == ATH9K_M_STA) {

	/* Check for NL80211_IFTYPE_AP and sc_nostabeacons for WDS client */

	if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_STATION) {

		struct ath9k_beacon_state bs;

		u64 tsf;

		u32 tsftu;
@@ -774,7 +774,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
		ath9k_hw_set_interrupts(ah, 0);

		if (nexttbtt == intval)

			intval |= ATH9K_BEACON_RESET_TSF;

		if (sc->sc_ah->ah_opmode == ATH9K_M_IBSS) {

		if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_ADHOC) {

			/*

			 * Pull nexttbtt forward to reflect the current

			 * TSF
@@ -806,7 +806,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
			if (!(ah->ah_caps.hw_caps & ATH9K_HW_CAP_VEOL))

				sc->sc_imask |= ATH9K_INT_SWBA;

			ath_beaconq_config(sc);

		} else if (sc->sc_ah->ah_opmode == ATH9K_M_HOSTAP) {

		} else if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_AP) {

			/*

			 * In AP mode we enable the beacon timers and

			 * SWBA interrupts to prepare beacon frames.
@@ -822,7 +822,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
		 * When using a self-linked beacon descriptor in

		 * ibss mode load it once here.

		 */

		if (sc->sc_ah->ah_opmode == ATH9K_M_IBSS &&

		if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_ADHOC &&

		    (ah->ah_caps.hw_caps & ATH9K_HW_CAP_VEOL))

			ath_beacon_start_adhoc(sc, 0);

	}

drivers/net/wireless/ath9k/core.h

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid 


struct ath_vap {

	int av_bslot;

	enum ath9k_opmode av_opmode;

	enum nl80211_iftype av_opmode;

	struct ath_buf *av_bcbuf;

	struct ath_tx_control av_btxctl;

};

drivers/net/wireless/ath9k/hw.c

+18 −11
Original line number Diff line number Diff line
@@ -1040,7 +1040,8 @@ static void ath9k_hw_init_chain_masks(struct ath_hal *ah) 
			  REG_READ(ah, AR_PHY_ANALOG_SWAP) | 0x00000001);

}



static void ath9k_hw_init_interrupt_masks(struct ath_hal *ah, enum ath9k_opmode opmode)

static void ath9k_hw_init_interrupt_masks(struct ath_hal *ah,

					  enum nl80211_iftype opmode)

{

	struct ath_hal_5416 *ahp = AH5416(ah);
@@ -1057,7 +1058,7 @@ static void ath9k_hw_init_interrupt_masks(struct ath_hal *ah, enum ath9k_opmode 


	ahp->ah_maskReg |= AR_IMR_TXOK;



	if (opmode == ATH9K_M_HOSTAP)

	if (opmode == NL80211_IFTYPE_AP)

		ahp->ah_maskReg |= AR_IMR_MIB;



	REG_WRITE(ah, AR_IMR, ahp->ah_maskReg);
@@ -1423,18 +1424,18 @@ static void ath9k_hw_set_operating_mode(struct ath_hal *ah, int opmode) 
	val = REG_READ(ah, AR_STA_ID1);

	val &= ~(AR_STA_ID1_STA_AP | AR_STA_ID1_ADHOC);

	switch (opmode) {

	case ATH9K_M_HOSTAP:

	case NL80211_IFTYPE_AP:

		REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_STA_AP

			  | AR_STA_ID1_KSRCH_MODE);

		REG_CLR_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);

		break;

	case ATH9K_M_IBSS:

	case NL80211_IFTYPE_ADHOC:

		REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_ADHOC

			  | AR_STA_ID1_KSRCH_MODE);

		REG_SET_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);

		break;

	case ATH9K_M_STA:

	case ATH9K_M_MONITOR:

	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_MONITOR:

		REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_KSRCH_MODE);

		break;

	}
@@ -3054,14 +3055,14 @@ void ath9k_hw_beaconinit(struct ath_hal *ah, u32 next_beacon, u32 beacon_period) 
	ahp->ah_beaconInterval = beacon_period;



	switch (ah->ah_opmode) {

	case ATH9K_M_STA:

	case ATH9K_M_MONITOR:

	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_MONITOR:

		REG_WRITE(ah, AR_NEXT_TBTT_TIMER, TU_TO_USEC(next_beacon));

		REG_WRITE(ah, AR_NEXT_DMA_BEACON_ALERT, 0xffff);

		REG_WRITE(ah, AR_NEXT_SWBA, 0x7ffff);

		flags |= AR_TBTT_TIMER_EN;

		break;

	case ATH9K_M_IBSS:

	case NL80211_IFTYPE_ADHOC:

		REG_SET_BIT(ah, AR_TXCFG,

			    AR_TXCFG_ADHOC_BEACON_ATIM_TX_POLICY);

		REG_WRITE(ah, AR_NEXT_NDP_TIMER,
@@ -3069,7 +3070,7 @@ void ath9k_hw_beaconinit(struct ath_hal *ah, u32 next_beacon, u32 beacon_period) 
				     (ahp->ah_atimWindow ? ahp->

				      ah_atimWindow : 1)));

		flags |= AR_NDP_TIMER_EN;

	case ATH9K_M_HOSTAP:

	case NL80211_IFTYPE_AP:

		REG_WRITE(ah, AR_NEXT_TBTT_TIMER, TU_TO_USEC(next_beacon));

		REG_WRITE(ah, AR_NEXT_DMA_BEACON_ALERT,

			  TU_TO_USEC(next_beacon -
@@ -3082,6 +3083,12 @@ void ath9k_hw_beaconinit(struct ath_hal *ah, u32 next_beacon, u32 beacon_period) 
		flags |=

			AR_TBTT_TIMER_EN | AR_DBA_TIMER_EN | AR_SWBA_TIMER_EN;

		break;

	default:

		DPRINTF(ah->ah_sc, ATH_DBG_BEACON,

			"%s: unsupported opmode: %d\n",

			__func__, ah->ah_opmode);

		return;

		break;

	}



	REG_WRITE(ah, AR_BEACON_PERIOD, TU_TO_USEC(beacon_period));
@@ -3177,7 +3184,7 @@ bool ath9k_hw_fill_cap_info(struct ath_hal *ah) 


	capField = ath9k_hw_get_eeprom(ah, EEP_OP_CAP);



	if (ah->ah_opmode != ATH9K_M_HOSTAP &&

	if (ah->ah_opmode != NL80211_IFTYPE_AP &&

	    ah->ah_subvendorid == AR_SUBVENDOR_ID_NEW_A) {

		if (ah->ah_currentRD == 0x64 || ah->ah_currentRD == 0x65)

			ah->ah_currentRD += 5;