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

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

ath9k: Use a single opmode variable 



ah_opmode and sc_opmode are redundant.
This patch removes sc_opmode.

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

drivers/net/wireless/ath9k/ath9k.h

+1 −1
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ bool ath9k_regd_init_channels(struct ath_hal *ah, 
u32 ath9k_hw_mhz2ieee(struct ath_hal *ah, u32 freq, u32 flags);

enum ath9k_int ath9k_hw_set_interrupts(struct ath_hal *ah,

				     enum ath9k_int ints);

bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,

bool ath9k_hw_reset(struct ath_hal *ah,

		    struct ath9k_channel *chan,

		    enum ath9k_ht_macmode macmode,

		    u8 txchainmask, u8 rxchainmask,

drivers/net/wireless/ath9k/beacon.c

+9 −9
Original line number Diff line number Diff line
@@ -33,7 +33,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_opmode == ATH9K_M_HOSTAP) {

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

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

		qi.tqi_aifs = 1;

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


	flags = ATH9K_TXDESC_NOACK;



	if (sc->sc_opmode == ATH9K_M_IBSS &&

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

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

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

		flags |= ATH9K_TXDESC_VEOL;
@@ -375,7 +375,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_opmode == ATH9K_M_HOSTAP ||

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

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

			int slot;

			/*
@@ -750,7 +750,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
	if (if_id != ATH_IF_ID_ANY)

		av_opmode = sc->sc_vaps[if_id]->av_opmode;

	else

		av_opmode = sc->sc_opmode;

		av_opmode = sc->sc_ah->ah_opmode;



	memzero(&conf, sizeof(struct ath_beacon_config));
@@ -770,7 +770,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
	nexttbtt = TSF_TO_TU(get_unaligned_le32(conf.u.last_tstamp + 4),

			     get_unaligned_le32(conf.u.last_tstamp));

	/* XXX conditionalize multi-bss support? */

	if (sc->sc_opmode == ATH9K_M_HOSTAP) {

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

		/*

		 * For multi-bss ap support beacons are either staggered

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

		__func__, nexttbtt, intval, conf.beacon_interval);

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

	if (sc->sc_opmode == ATH9K_M_STA) {

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

		struct ath9k_beacon_state bs;

		u64 tsf;

		u32 tsftu;
@@ -911,7 +911,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_opmode == ATH9K_M_IBSS) {

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

			/*

			 * Pull nexttbtt forward to reflect the current

			 * TSF .
@@ -943,7 +943,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_opmode == ATH9K_M_HOSTAP) {

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

			/*

			 * In AP mode we enable the beacon timers and

			 * SWBA interrupts to prepare beacon frames.
@@ -959,7 +959,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_opmode == ATH9K_M_IBSS &&

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

		    (ah->ah_caps.hw_caps & ATH9K_HW_CAP_VEOL))

			ath_beacon_start_adhoc(sc, 0);

	}

drivers/net/wireless/ath9k/core.c

+12 −9
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ int ath_set_channel(struct ath_softc *sc, struct ath9k_channel *hchan) 
			fastcc = false;



		spin_lock_bh(&sc->sc_resetlock);

		if (!ath9k_hw_reset(ah, sc->sc_opmode, hchan,

		if (!ath9k_hw_reset(ah, hchan,

					ht_macmode, sc->sc_tx_chainmask,

					sc->sc_rx_chainmask,

					sc->sc_ht_extprotspacing,
@@ -533,7 +533,8 @@ int ath_vap_listen(struct ath_softc *sc, int if_id) 
	rfilt = ath_calcrxfilter(sc);

	ath9k_hw_setrxfilter(ah, rfilt);



	if (sc->sc_opmode == ATH9K_M_STA || sc->sc_opmode == ATH9K_M_IBSS) {

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

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

		memcpy(sc->sc_curbssid, ath_bcast_mac, ETH_ALEN);

		ath9k_hw_write_associd(ah, sc->sc_curbssid, sc->sc_curaid);

	} else
@@ -603,7 +604,7 @@ int ath_vap_attach(struct ath_softc *sc, 
	sc->sc_vaps[if_id] = avp;

	sc->sc_nvaps++;

	/* Set the device opmode */

	sc->sc_opmode = opmode;

	sc->sc_ah->ah_opmode = opmode;



	/* default VAP configuration */

	avp->av_config.av_fixed_rateset = IEEE80211_FIXED_RATE_NONE;
@@ -677,7 +678,8 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan) 
	int error = 0;

	enum ath9k_ht_macmode ht_macmode = ath_cwm_macmode(sc);



	DPRINTF(sc, ATH_DBG_CONFIG, "%s: mode %d\n", __func__, sc->sc_opmode);

	DPRINTF(sc, ATH_DBG_CONFIG, "%s: mode %d\n",

		__func__, sc->sc_ah->ah_opmode);



	/*

	 * Stop anything previously setup.  This is safe
@@ -702,7 +704,7 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan) 
	sc->sc_curchan = *initial_chan;



	spin_lock_bh(&sc->sc_resetlock);

	if (!ath9k_hw_reset(ah, sc->sc_opmode, &sc->sc_curchan, ht_macmode,

	if (!ath9k_hw_reset(ah, &sc->sc_curchan, ht_macmode,

			   sc->sc_tx_chainmask, sc->sc_rx_chainmask,

			   sc->sc_ht_extprotspacing, false, &status)) {

		DPRINTF(sc, ATH_DBG_FATAL,
@@ -749,7 +751,8 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan) 
	 * Note we only do this (at the moment) for station mode.

	 */

	if (ath9k_hw_phycounters(ah) &&

	    ((sc->sc_opmode == ATH9K_M_STA) || (sc->sc_opmode == ATH9K_M_IBSS)))

	    ((sc->sc_ah->ah_opmode == ATH9K_M_STA) ||

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

		sc->sc_imask |= ATH9K_INT_MIB;

	/*

	 * Some hardware processes the TIM IE and fires an
@@ -758,7 +761,7 @@ int ath_open(struct ath_softc *sc, struct ath9k_channel *initial_chan) 
	 * enable the TIM interrupt when operating as station.

	 */

	if ((ah->ah_caps.hw_caps & ATH9K_HW_CAP_ENHANCEDPM) &&

	    (sc->sc_opmode == ATH9K_M_STA) &&

	    (sc->sc_ah->ah_opmode == ATH9K_M_STA) &&

	    !sc->sc_config.swBeaconProcess)

		sc->sc_imask |= ATH9K_INT_TIM;

	/*
@@ -789,7 +792,7 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) 


	/* Reset chip */

	spin_lock_bh(&sc->sc_resetlock);

	if (!ath9k_hw_reset(ah, sc->sc_opmode, &sc->sc_curchan,

	if (!ath9k_hw_reset(ah, &sc->sc_curchan,

			   ht_macmode,

			   sc->sc_tx_chainmask, sc->sc_rx_chainmask,

			   sc->sc_ht_extprotspacing, false, &status)) {
@@ -1096,7 +1099,7 @@ int ath_init(u16 devid, struct ath_softc *sc) 
		goto bad;



	/* default to STA mode */

	sc->sc_opmode = ATH9K_M_MONITOR;

	sc->sc_ah->ah_opmode = ATH9K_M_MONITOR;



	/* Setup rate tables */

drivers/net/wireless/ath9k/core.h

+3 −3
Original line number Diff line number Diff line
@@ -895,15 +895,15 @@ struct ath_ht_info { 
struct ath_softc {

	struct ieee80211_hw *hw;

	struct pci_dev *pdev;

	void __iomem *mem;

	struct tasklet_struct intr_tq;

	struct tasklet_struct bcon_tasklet;

	struct ath_config sc_config;	/* load-time parameters */

	int sc_debug;

	struct ath_hal *sc_ah;

	struct ath_rate_softc *sc_rc;	/* tx rate control support */

	void __iomem *mem;



	int sc_debug;

	u32 sc_intrstatus;

	enum ath9k_opmode sc_opmode;	/* current operating mode */

	unsigned int rx_filter;

	u8 sc_invalid;			/* being detached */

	u8 sc_beacons;			/* beacons running */

drivers/net/wireless/ath9k/hw.c

+3 −5
Original line number Diff line number Diff line
@@ -5839,7 +5839,7 @@ static inline bool ath9k_hw_init_cal(struct ath_hal *ah, 
}





bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode,

bool ath9k_hw_reset(struct ath_hal *ah,

		    struct ath9k_channel *chan,

		    enum ath9k_ht_macmode macmode,

		    u8 txchainmask, u8 rxchainmask,
@@ -5953,7 +5953,7 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode, 
		  | (ah->ah_config.

		     ack_6mb ? AR_STA_ID1_ACKCTS_6MB : 0)

		  | ahp->ah_staId1Defaults);

	ath9k_hw_set_operating_mode(ah, opmode);

	ath9k_hw_set_operating_mode(ah, ah->ah_opmode);



	REG_WRITE(ah, AR_BSSMSKL, get_unaligned_le32(ahp->ah_bssidmask));

	REG_WRITE(ah, AR_BSSMSKU, get_unaligned_le16(ahp->ah_bssidmask + 4));
@@ -5983,13 +5983,11 @@ bool ath9k_hw_reset(struct ath_hal *ah, enum ath9k_opmode opmode, 
	for (i = 0; i < ah->ah_caps.total_queues; i++)

		ath9k_hw_resettxqueue(ah, i);



	ath9k_hw_init_interrupt_masks(ah, opmode);

	ath9k_hw_init_interrupt_masks(ah, ah->ah_opmode);

	ath9k_hw_init_qos(ah);



	ath9k_hw_init_user_settings(ah);



	ah->ah_opmode = opmode;



	REG_WRITE(ah, AR_STA_ID1,

		  REG_READ(ah, AR_STA_ID1) | AR_STA_ID1_PRESERVE_SEQNUM);