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

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

ath9k: Refactor struct ath_softc 



Split ath_softc into smaller structures for rx, tx and beacon
handling.

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

drivers/net/wireless/ath9k/beacon.c

+47 −47
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int ath_beaconq_config(struct ath_softc *sc) 
	struct ath_hal *ah = sc->sc_ah;

	struct ath9k_tx_queue_info qi;



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

	ath9k_hw_get_txq_props(ah, sc->beacon.beaconq, &qi);

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

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

		qi.tqi_aifs = 1;
@@ -34,17 +34,17 @@ static int ath_beaconq_config(struct ath_softc *sc) 
		qi.tqi_cwmax = 0;

	} else {

		/* Adhoc mode; important thing is to use 2x cwmin. */

		qi.tqi_aifs = sc->sc_beacon_qi.tqi_aifs;

		qi.tqi_cwmin = 2*sc->sc_beacon_qi.tqi_cwmin;

		qi.tqi_cwmax = sc->sc_beacon_qi.tqi_cwmax;

		qi.tqi_aifs = sc->beacon.beacon_qi.tqi_aifs;

		qi.tqi_cwmin = 2*sc->beacon.beacon_qi.tqi_cwmin;

		qi.tqi_cwmax = sc->beacon.beacon_qi.tqi_cwmax;

	}



	if (!ath9k_hw_set_txq_props(ah, sc->sc_bhalq, &qi)) {

	if (!ath9k_hw_set_txq_props(ah, sc->beacon.beaconq, &qi)) {

		DPRINTF(sc, ATH_DBG_FATAL,

			"unable to update h/w beacon queue parameters\n");

		return 0;

	} else {

		ath9k_hw_resettxqueue(ah, sc->sc_bhalq); /* push to h/w */

		ath9k_hw_resettxqueue(ah, sc->beacon.beaconq); /* push to h/w */

		return 1;

	}

}
@@ -53,7 +53,7 @@ static void ath_bstuck_process(struct ath_softc *sc) 
{

	DPRINTF(sc, ATH_DBG_BEACON,

		"stuck beacon; resetting (bmiss count %u)\n",

		sc->sc_bmisscount);

		sc->beacon.bmisscnt);

	ath_reset(sc, false);

}
@@ -96,7 +96,7 @@ static void ath_beacon_setup(struct ath_softc *sc, 
		 * SWBA's

		 * XXX assumes two antenna

		 */

		antenna = ((sc->ast_be_xmit / sc->sc_nbcnvaps) & 1 ? 2 : 1);

		antenna = ((sc->beacon.ast_be_xmit / sc->sc_nbcnvaps) & 1 ? 2 : 1);

	}



	ds->ds_data = bf->bf_buf_addr;
@@ -153,7 +153,7 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id) 
	ASSERT(vif);



	avp = (void *)vif->drv_priv;

	cabq = sc->sc_cabq;

	cabq = sc->beacon.cabq;



	if (avp->av_bcbuf == NULL) {

		DPRINTF(sc, ATH_DBG_BEACON, "avp=%p av_bcbuf=%p\n",
@@ -182,9 +182,9 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id) 
		 * TX frames)

		 */

		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

		sc->seq_no += 0x10;

		sc->tx.seq_no += 0x10;

		hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);

		hdr->seq_ctrl |= cpu_to_le16(sc->seq_no);

		hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);

	}



	bf->bf_buf_addr = bf->bf_dmacontext =
@@ -270,10 +270,10 @@ static void ath_beacon_start_adhoc(struct ath_softc *sc, int if_id) 
	ath_beacon_setup(sc, avp, bf);



	/* NB: caller is known to have already stopped tx dma */

	ath9k_hw_puttxbuf(ah, sc->sc_bhalq, bf->bf_daddr);

	ath9k_hw_txstart(ah, sc->sc_bhalq);

	ath9k_hw_puttxbuf(ah, sc->beacon.beaconq, bf->bf_daddr);

	ath9k_hw_txstart(ah, sc->beacon.beaconq);

	DPRINTF(sc, ATH_DBG_BEACON, "TXDP%u = %llx (%p)\n",

		sc->sc_bhalq, ito64(bf->bf_daddr), bf->bf_desc);

		sc->beacon.beaconq, ito64(bf->bf_daddr), bf->bf_desc);

}



int ath_beaconq_setup(struct ath_hal *ah)
@@ -306,7 +306,7 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id) 
	if (!avp->av_bcbuf) {

		/* Allocate beacon state for hostap/ibss.  We know

		 * a buffer is available. */

		avp->av_bcbuf = list_first_entry(&sc->sc_bbuf,

		avp->av_bcbuf = list_first_entry(&sc->beacon.bbuf,

						 struct ath_buf, list);

		list_del(&avp->av_bcbuf->list);
@@ -319,13 +319,13 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id) 
			 */

			avp->av_bslot = 0;

			for (slot = 0; slot < ATH_BCBUF; slot++)

				if (sc->sc_bslot[slot] == ATH_IF_ID_ANY) {

				if (sc->beacon.bslot[slot] == ATH_IF_ID_ANY) {

					/*

					 * XXX hack, space out slots to better

					 * deal with misses

					 */

					if (slot+1 < ATH_BCBUF &&

					    sc->sc_bslot[slot+1] ==

					    sc->beacon.bslot[slot+1] ==

						ATH_IF_ID_ANY) {

						avp->av_bslot = slot+1;

						break;
@@ -333,8 +333,8 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id) 
					avp->av_bslot = slot;

					/* NB: keep looking for a double slot */

				}

			BUG_ON(sc->sc_bslot[avp->av_bslot] != ATH_IF_ID_ANY);

			sc->sc_bslot[avp->av_bslot] = if_id;

			BUG_ON(sc->beacon.bslot[avp->av_bslot] != ATH_IF_ID_ANY);

			sc->beacon.bslot[avp->av_bslot] = if_id;

			sc->sc_nbcnvaps++;

		}

	}
@@ -362,7 +362,7 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id) 
	}



	tstamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;

	sc->bc_tstamp = le64_to_cpu(tstamp);

	sc->beacon.bc_tstamp = le64_to_cpu(tstamp);



	/*

	 * Calculate a TSF adjustment factor required for
@@ -422,7 +422,7 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp) 
		struct ath_buf *bf;



		if (avp->av_bslot != -1) {

			sc->sc_bslot[avp->av_bslot] = ATH_IF_ID_ANY;

			sc->beacon.bslot[avp->av_bslot] = ATH_IF_ID_ANY;

			sc->sc_nbcnvaps--;

		}
@@ -435,7 +435,7 @@ void ath_beacon_return(struct ath_softc *sc, struct ath_vap *avp) 
			dev_kfree_skb_any(skb);

			bf->bf_mpdu = NULL;

		}

		list_add_tail(&bf->list, &sc->sc_bbuf);

		list_add_tail(&bf->list, &sc->beacon.bbuf);



		avp->av_bcbuf = NULL;

	}
@@ -469,18 +469,18 @@ void ath9k_beacon_tasklet(unsigned long data) 
	 *

	 * FIXME: Clean up this mess !!

	 */

	if (ath9k_hw_numtxpending(ah, sc->sc_bhalq) != 0) {

		sc->sc_bmisscount++;

	if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0) {

		sc->beacon.bmisscnt++;

		/* XXX: doth needs the chanchange IE countdown decremented.

		 *      We should consider adding a mac80211 call to indicate

		 *      a beacon miss so appropriate action could be taken

		 *      (in that layer).

		 */

		if (sc->sc_bmisscount < BSTUCK_THRESH) {

		if (sc->beacon.bmisscnt < BSTUCK_THRESH) {

			if (sc->sc_flags & SC_OP_NO_RESET) {

				DPRINTF(sc, ATH_DBG_BEACON,

					"missed %u consecutive beacons\n",

					sc->sc_bmisscount);

					sc->beacon.bmisscnt);

				if (show_cycles) {

					/*

					 * Display cycle counter stats from HW
@@ -499,11 +499,11 @@ void ath9k_beacon_tasklet(unsigned long data) 
			} else {

				DPRINTF(sc, ATH_DBG_BEACON,

					"missed %u consecutive beacons\n",

					sc->sc_bmisscount);

					sc->beacon.bmisscnt);

			}

		} else if (sc->sc_bmisscount >= BSTUCK_THRESH) {

		} else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) {

			if (sc->sc_flags & SC_OP_NO_RESET) {

				if (sc->sc_bmisscount == BSTUCK_THRESH) {

				if (sc->beacon.bmisscnt == BSTUCK_THRESH) {

					DPRINTF(sc, ATH_DBG_BEACON,

						"beacon is officially "

						"stuck\n");
@@ -517,17 +517,17 @@ void ath9k_beacon_tasklet(unsigned long data) 
		return;

	}



	if (sc->sc_bmisscount != 0) {

	if (sc->beacon.bmisscnt != 0) {

		if (sc->sc_flags & SC_OP_NO_RESET) {

			DPRINTF(sc, ATH_DBG_BEACON,

				"resume beacon xmit after %u misses\n",

				sc->sc_bmisscount);

				sc->beacon.bmisscnt);

		} else {

			DPRINTF(sc, ATH_DBG_BEACON,

				"resume beacon xmit after %u misses\n",

				sc->sc_bmisscount);

				sc->beacon.bmisscnt);

		}

		sc->sc_bmisscount = 0;

		sc->beacon.bmisscnt = 0;

	}



	/*
@@ -542,7 +542,7 @@ void ath9k_beacon_tasklet(unsigned long data) 
	tsf = ath9k_hw_gettsf64(ah);

	tsftu = TSF_TO_TU(tsf>>32, tsf);

	slot = ((tsftu % intval) * ATH_BCBUF) / intval;

	if_id = sc->sc_bslot[(slot + 1) % ATH_BCBUF];

	if_id = sc->beacon.bslot[(slot + 1) % ATH_BCBUF];



	DPRINTF(sc, ATH_DBG_BEACON,

		"slot %d [tsf %llu tsftu %u intval %u] if_id %d\n",
@@ -574,12 +574,12 @@ void ath9k_beacon_tasklet(unsigned long data) 
	 *     set to ATH_BCBUF so this check is a noop.

	 */

	/* XXX locking */

	if (sc->sc_updateslot == UPDATE) {

		sc->sc_updateslot = COMMIT; /* commit next beacon */

		sc->sc_slotupdate = slot;

	} else if (sc->sc_updateslot == COMMIT && sc->sc_slotupdate == slot) {

		ath9k_hw_setslottime(sc->sc_ah, sc->sc_slottime);

		sc->sc_updateslot = OK;

	if (sc->beacon.updateslot == UPDATE) {

		sc->beacon.updateslot = COMMIT; /* commit next beacon */

		sc->beacon.slotupdate = slot;

	} else if (sc->beacon.updateslot == COMMIT && sc->beacon.slotupdate == slot) {

		ath9k_hw_setslottime(sc->sc_ah, sc->beacon.slottime);

		sc->beacon.updateslot = OK;

	}

	if (bfaddr != 0) {

		/*
@@ -587,17 +587,17 @@ void ath9k_beacon_tasklet(unsigned long data) 
		 * This should never fail since we check above that no frames

		 * are still pending on the queue.

		 */

		if (!ath9k_hw_stoptxdma(ah, sc->sc_bhalq)) {

		if (!ath9k_hw_stoptxdma(ah, sc->beacon.beaconq)) {

			DPRINTF(sc, ATH_DBG_FATAL,

				"beacon queue %u did not stop?\n", sc->sc_bhalq);

				"beacon queue %u did not stop?\n", sc->beacon.beaconq);

			/* NB: the HAL still stops DMA, so proceed */

		}



		/* NB: cabq traffic should already be queued and primed */

		ath9k_hw_puttxbuf(ah, sc->sc_bhalq, bfaddr);

		ath9k_hw_txstart(ah, sc->sc_bhalq);

		ath9k_hw_puttxbuf(ah, sc->beacon.beaconq, bfaddr);

		ath9k_hw_txstart(ah, sc->beacon.beaconq);



		sc->ast_be_xmit += bc;     /* XXX per-vap? */

		sc->beacon.ast_be_xmit += bc;     /* XXX per-vap? */

	}

}
@@ -644,7 +644,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
	conf.bmiss_timeout = ATH_DEFAULT_BMISS_LIMIT * conf.beacon_interval;



	/* extract tstamp from last beacon and convert to TU */

	nexttbtt = TSF_TO_TU(sc->bc_tstamp >> 32, sc->bc_tstamp);

	nexttbtt = TSF_TO_TU(sc->beacon.bc_tstamp >> 32, sc->beacon.bc_tstamp);



	/* XXX conditionalize multi-bss support? */

	if (sc->sc_ah->ah_opmode == NL80211_IFTYPE_AP) {
@@ -831,7 +831,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id) 
			ath_beaconq_config(sc);

		}

		ath9k_hw_beaconinit(ah, nexttbtt, intval);

		sc->sc_bmisscount = 0;

		sc->beacon.bmisscnt = 0;

		ath9k_hw_set_interrupts(ah, sc->sc_imask);

		/*

		 * When using a self-linked beacon descriptor in

drivers/net/wireless/ath9k/core.h

+61 −73
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct ath_node; 
#define TSF_TO_TU(_h,_l) \

	((((u32)(_h)) << 22) | (((u32)(_l)) >> 10))



#define	ATH_TXQ_SETUP(sc, i)        ((sc)->sc_txqsetup & (1<<i))

#define	ATH_TXQ_SETUP(sc, i)        ((sc)->tx.txqsetup & (1<<i))



static const u8 ath_bcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@@ -453,6 +453,28 @@ struct ath_node { 
	u8 mpdudensity;

};



struct ath_tx {

	u16 seq_no;

	u32 txqsetup;

	int hwq_map[ATH9K_WME_AC_VO+1];

	spinlock_t txbuflock;

	struct list_head txbuf;

	struct ath_txq txq[ATH9K_NUM_TX_QUEUES];

	struct ath_descdma txdma;

};



struct ath_rx {

	u8 defant;

	u8 rxotherant;

	u32 *rxlink;

	int bufsize;

	unsigned int rxfilter;

	spinlock_t rxflushlock;

	spinlock_t rxbuflock;

	struct list_head rxbuf;

	struct ath_descdma rxdma;

};



int ath_startrecv(struct ath_softc *sc);

bool ath_stoprecv(struct ath_softc *sc);

void ath_flushrecv(struct ath_softc *sc);
@@ -540,6 +562,26 @@ struct ath_beacon_config { 
	} u; /* last received beacon/probe response timestamp of this BSS. */

};



struct ath_beacon {

	enum {

		OK,		/* no change needed */

		UPDATE,		/* update pending */

		COMMIT		/* beacon sent, commit change */

	} updateslot;		/* slot time update fsm */



	u32 beaconq;

	u32 bmisscnt;

	u32 ast_be_xmit;

	u64 bc_tstamp;

	int bslot[ATH_BCBUF];

	int slottime;

	int slotupdate;

	struct ath9k_tx_queue_info beacon_qi;

	struct ath_descdma bdma;

	struct ath_txq *cabq;

	struct list_head bbuf;

};



void ath9k_beacon_tasklet(unsigned long data);

void ath_beacon_config(struct ath_softc *sc, int if_id);

int ath_beaconq_setup(struct ath_hal *ah);
@@ -656,105 +698,51 @@ struct ath_softc { 
	struct pci_dev *pdev;

	struct tasklet_struct intr_tq;

	struct tasklet_struct bcon_tasklet;

	struct ath_config sc_config;

	struct ath_hal *sc_ah;

	void __iomem *mem;

	spinlock_t sc_resetlock;



	u8 sc_curbssid[ETH_ALEN];

	u8 sc_myaddr[ETH_ALEN];

	u8 sc_bssidmask[ETH_ALEN];



#ifdef CONFIG_ATH9K_DEBUG

	struct ath9k_debug sc_debug;

#endif

	u32 sc_intrstatus;

	u32 sc_flags; /* SC_OP_* */

	unsigned int rx_filter;

	u16 sc_curtxpow;

	u16 sc_curaid;

	u16 sc_cachelsz;

	int sc_slotupdate;		/* slot to next advance fsm */

	int sc_slottime;

	int sc_bslot[ATH_BCBUF];

	u8 sc_nbcnvaps;

	u16 sc_nvaps;

	u8 sc_tx_chainmask;

	u8 sc_rx_chainmask;

	u32 sc_keymax;

	DECLARE_BITMAP(sc_keymap, ATH_KEYMAX);

	u8 sc_splitmic;

	u8 sc_protrix;

	enum ath9k_int sc_imask;

	enum PROT_MODE sc_protmode;



	u8 sc_nbcnvaps;

	u16 sc_nvaps;

	struct ieee80211_vif *sc_vaps[ATH_BCBUF];



	u8 sc_mcastantenna;

	u8 sc_defant;

	u8 sc_rxotherant;



	struct ath9k_node_stats sc_halstats;

	enum ath9k_ht_extprotspacing sc_ht_extprotspacing;

	enum ath9k_ht_macmode tx_chan_width;



	enum {

		OK,		/* no change needed */

		UPDATE,		/* update pending */

		COMMIT		/* beacon sent, commit change */

	} sc_updateslot;	/* slot time update fsm */



	/* Crypto */

	u32 sc_keymax;

	DECLARE_BITMAP(sc_keymap, ATH_KEYMAX);

	u8 sc_splitmic;		/* split TKIP MIC keys */



	/* RX */

	struct list_head sc_rxbuf;

	struct ath_descdma sc_rxdma;

	int sc_rxbufsize;

	u32 *sc_rxlink;



	/* TX */

	struct list_head sc_txbuf;

	struct ath_txq sc_txq[ATH9K_NUM_TX_QUEUES];

	struct ath_descdma sc_txdma;

	u32 sc_txqsetup;

	int sc_haltype2q[ATH9K_WME_AC_VO+1];

	u16 seq_no; /* TX sequence number */



	/* Beacon */

	struct ath9k_tx_queue_info sc_beacon_qi;

	struct ath_descdma sc_bdma;

	struct ath_txq *sc_cabq;

	struct list_head sc_bbuf;

	u32 sc_bhalq;

	u32 sc_bmisscount;

	u32 ast_be_xmit;

	u64 bc_tstamp;



	/* Rate */

	struct ath_config sc_config;

	struct ath_rx rx;

	struct ath_tx tx;

	struct ath_beacon beacon;

	struct ieee80211_vif *sc_vaps[ATH_BCBUF];

	struct ieee80211_rate rates[IEEE80211_NUM_BANDS][ATH_RATE_MAX];

	struct ath_rate_table *hw_rate_table[ATH9K_MODE_MAX];

	struct ath_rate_table *cur_rate_table;

	u8 sc_protrix;



	/* Channel, Band */

	struct ieee80211_channel channels[IEEE80211_NUM_BANDS][ATH_CHAN_MAX];

	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];



	/* Locks */

	spinlock_t sc_rxflushlock;

	spinlock_t sc_rxbuflock;

	spinlock_t sc_txbuflock;

	spinlock_t sc_resetlock;



	/* LEDs */

	struct ath_led radio_led;

	struct ath_led assoc_led;

	struct ath_led tx_led;

	struct ath_led rx_led;



	/* Rfkill */

	struct ath_rfkill rf_kill;



	/* ANI */

	struct ath_ani sc_ani;

	struct ath9k_node_stats sc_halstats;

#ifdef CONFIG_ATH9K_DEBUG

	struct ath9k_debug sc_debug;

#endif

};



int ath_reset(struct ath_softc *sc, bool retry_tx);

drivers/net/wireless/ath9k/main.c

+30 −30
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void ath_ani_calibrate(unsigned long data) 
	* don't calibrate when we're scanning.

	* we are most likely not on our home channel.

	*/

	if (sc->rx_filter & FIF_BCN_PRBRESP_PROMISC)

	if (sc->rx.rxfilter & FIF_BCN_PRBRESP_PROMISC)

		return;



	/* Long calibration runs independently of short calibration. */
@@ -487,9 +487,9 @@ static void ath9k_tasklet(unsigned long data) 


		if (status &

		    (ATH9K_INT_RX | ATH9K_INT_RXEOL | ATH9K_INT_RXORN)) {

			spin_lock_bh(&sc->sc_rxflushlock);

			spin_lock_bh(&sc->rx.rxflushlock);

			ath_rx_tasklet(sc, 0);

			spin_unlock_bh(&sc->sc_rxflushlock);

			spin_unlock_bh(&sc->rx.rxflushlock);

		}

		/* XXX: optimize this */

		if (status & ATH9K_INT_TX)
@@ -1306,7 +1306,7 @@ static void ath_detach(struct ath_softc *sc) 
	/* cleanup tx queues */

	for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)

		if (ATH_TXQ_SETUP(sc, i))

			ath_tx_cleanupq(sc, &sc->sc_txq[i]);

			ath_tx_cleanupq(sc, &sc->tx.txq[i]);



	ath9k_hw_detach(sc->sc_ah);

	ath9k_exit_debug(sc);
@@ -1397,15 +1397,15 @@ static int ath_init(u16 devid, struct ath_softc *sc) 
	 * priority.  Note that the hal handles reseting

	 * these queues at the needed time.

	 */

	sc->sc_bhalq = ath_beaconq_setup(ah);

	if (sc->sc_bhalq == -1) {

	sc->beacon.beaconq = ath_beaconq_setup(ah);

	if (sc->beacon.beaconq == -1) {

		DPRINTF(sc, ATH_DBG_FATAL,

			"Unable to setup a beacon xmit queue\n");

		error = -EIO;

		goto bad2;

	}

	sc->sc_cabq = ath_txq_setup(sc, ATH9K_TX_QUEUE_CAB, 0);

	if (sc->sc_cabq == NULL) {

	sc->beacon.cabq = ath_txq_setup(sc, ATH9K_TX_QUEUE_CAB, 0);

	if (sc->beacon.cabq == NULL) {

		DPRINTF(sc, ATH_DBG_FATAL,

			"Unable to setup CAB xmit queue\n");

		error = -EIO;
@@ -1415,8 +1415,8 @@ static int ath_init(u16 devid, struct ath_softc *sc) 
	sc->sc_config.cabqReadytime = ATH_CABQ_READY_TIME;

	ath_cabq_update(sc);



	for (i = 0; i < ARRAY_SIZE(sc->sc_haltype2q); i++)

		sc->sc_haltype2q[i] = -1;

	for (i = 0; i < ARRAY_SIZE(sc->tx.hwq_map); i++)

		sc->tx.hwq_map[i] = -1;



	/* Setup data queues */

	/* NB: ensure BK queue is the lowest priority h/w queue */
@@ -1496,7 +1496,7 @@ static int ath_init(u16 devid, struct ath_softc *sc) 
	sc->sc_rx_chainmask = ah->ah_caps.rx_chainmask;



	ath9k_hw_setcapability(ah, ATH9K_CAP_DIVERSITY, 1, true, NULL);

	sc->sc_defant = ath9k_hw_getdefantenna(ah);

	sc->rx.defant = ath9k_hw_getdefantenna(ah);



	ath9k_hw_getmac(ah, sc->sc_myaddr);

	if (ah->ah_caps.hw_caps & ATH9K_HW_CAP_BSSIDMASK) {
@@ -1505,11 +1505,11 @@ static int ath_init(u16 devid, struct ath_softc *sc) 
		ath9k_hw_setbssidmask(ah, sc->sc_bssidmask);

	}



	sc->sc_slottime = ATH9K_SLOT_TIME_9;	/* default to short slot time */

	sc->beacon.slottime = ATH9K_SLOT_TIME_9;	/* default to short slot time */



	/* initialize beacon slots */

	for (i = 0; i < ARRAY_SIZE(sc->sc_bslot); i++)

		sc->sc_bslot[i] = ATH_IF_ID_ANY;

	for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++)

		sc->beacon.bslot[i] = ATH_IF_ID_ANY;



	/* save MISC configurations */

	sc->sc_config.swBeaconProcess = 1;
@@ -1535,7 +1535,7 @@ static int ath_init(u16 devid, struct ath_softc *sc) 
	/* cleanup tx queues */

	for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)

		if (ATH_TXQ_SETUP(sc, i))

			ath_tx_cleanupq(sc, &sc->sc_txq[i]);

			ath_tx_cleanupq(sc, &sc->tx.txq[i]);

bad:

	if (ah)

		ath9k_hw_detach(ah);
@@ -1673,9 +1673,9 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) 
		int i;

		for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {

			if (ATH_TXQ_SETUP(sc, i)) {

				spin_lock_bh(&sc->sc_txq[i].axq_lock);

				ath_txq_schedule(sc, &sc->sc_txq[i]);

				spin_unlock_bh(&sc->sc_txq[i].axq_lock);

				spin_lock_bh(&sc->tx.txq[i].axq_lock);

				ath_txq_schedule(sc, &sc->tx.txq[i]);

				spin_unlock_bh(&sc->tx.txq[i].axq_lock);

			}

		}

	}
@@ -1810,19 +1810,19 @@ int ath_get_hal_qnum(u16 queue, struct ath_softc *sc) 


	switch (queue) {

	case 0:

		qnum = sc->sc_haltype2q[ATH9K_WME_AC_VO];

		qnum = sc->tx.hwq_map[ATH9K_WME_AC_VO];

		break;

	case 1:

		qnum = sc->sc_haltype2q[ATH9K_WME_AC_VI];

		qnum = sc->tx.hwq_map[ATH9K_WME_AC_VI];

		break;

	case 2:

		qnum = sc->sc_haltype2q[ATH9K_WME_AC_BE];

		qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];

		break;

	case 3:

		qnum = sc->sc_haltype2q[ATH9K_WME_AC_BK];

		qnum = sc->tx.hwq_map[ATH9K_WME_AC_BK];

		break;

	default:

		qnum = sc->sc_haltype2q[ATH9K_WME_AC_BE];

		qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];

		break;

	}
@@ -1993,9 +1993,9 @@ static int ath9k_tx(struct ieee80211_hw *hw, 
	if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {

		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

		if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)

			sc->seq_no += 0x10;

			sc->tx.seq_no += 0x10;

		hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);

		hdr->seq_ctrl |= cpu_to_le16(sc->seq_no);

		hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);

	}



	/* Add the padding after the header if this is not already done */
@@ -2049,7 +2049,7 @@ static void ath9k_stop(struct ieee80211_hw *hw) 
		ath_stoprecv(sc);

		ath9k_hw_phy_disable(sc->sc_ah);

	} else

		sc->sc_rxlink = NULL;

		sc->rx.rxlink = NULL;



#if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)

	if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
@@ -2131,7 +2131,7 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, 
	/* Reclaim beacon resources */

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

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

		ath9k_hw_stoptxdma(sc->sc_ah, sc->sc_bhalq);

		ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);

		ath_beacon_return(sc, avp);

	}
@@ -2250,7 +2250,7 @@ static int ath9k_config_interface(struct ieee80211_hw *hw, 
		 * causes reconfiguration; we may be called

		 * with beacon transmission active.

		 */

		ath9k_hw_stoptxdma(sc->sc_ah, sc->sc_bhalq);

		ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);



		error = ath_beacon_alloc(sc, 0);

		if (error != 0)
@@ -2296,7 +2296,7 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw, 
	changed_flags &= SUPPORTED_FILTERS;

	*total_flags &= SUPPORTED_FILTERS;



	sc->rx_filter = *total_flags;

	sc->rx.rxfilter = *total_flags;

	rfilt = ath_calcrxfilter(sc);

	ath9k_hw_setrxfilter(sc->sc_ah, rfilt);
@@ -2305,7 +2305,7 @@ static void ath9k_configure_filter(struct ieee80211_hw *hw, 
			ath9k_hw_write_associd(sc->sc_ah, ath_bcast_mac, 0);

	}



	DPRINTF(sc, ATH_DBG_CONFIG, "Set HW RX filter: 0x%x\n", sc->rx_filter);

	DPRINTF(sc, ATH_DBG_CONFIG, "Set HW RX filter: 0x%x\n", sc->rx.rxfilter);

}



static void ath9k_sta_notify(struct ieee80211_hw *hw,

drivers/net/wireless/ath9k/recv.c

+53 −54

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/ath9k/xmit.c

+63 −63

File changed.

Preview size limit exceeded, changes collapsed.