ath9k: Whitespace cleanup (980b24da) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/ath9k/beacon.c

+60 −76

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@
		* the operating mode of the station (AP or AdHoc). Parameters are AIFS
		* settings and channel width min/max
		*/

		static int ath_beaconq_config(struct ath_softc *sc)
		{
		struct ath_hal *ah = sc->sc_ah;
		@@ -63,19 +62,18 @@ static int ath_beaconq_config(struct ath_softc *sc)
		* up all required antenna switch parameters, rate codes, and channel flags.
		* Beacons are always sent out at the lowest rate, and are not retried.
		*/

		static void ath_beacon_setup(struct ath_softc *sc,
		struct ath_vap avp, struct ath_buf bf)
		{
		struct sk_buff skb = (struct sk_buff )bf->bf_mpdu;
		struct ath_hal *ah = sc->sc_ah;
		struct ath_desc *ds;
		int flags, antenna;
		struct ath9k_11n_rate_series series[4];
		const struct ath9k_rate_table *rt;
		int flags, antenna;
		u8 rix, rate;
		int ctsrate = 0;
		int ctsduration = 0;
		struct ath9k_11n_rate_series series[4];

		DPRINTF(sc, ATH_DBG_BEACON, "%s: m %p len %u\n",
		__func__, skb, skb->len);
		@@ -120,7 +118,8 @@ static void ath_beacon_setup(struct ath_softc *sc,
		avp->av_btxctl.txpower, /* txpower XXX */
		ATH9K_TXKEYIX_INVALID, /* no encryption */
		ATH9K_KEY_TYPE_CLEAR, /* no encryption */
		flags /* no ack, veol for beacons */
		flags /* no ack,
		veol for beacons */
		);

		/* NB: beacon's BufLen must be a multiple of 4 bytes */
		@@ -153,20 +152,21 @@ static struct ath_buf ath_beacon_generate(struct ath_softc sc, int if_id)
		struct ath_buf *bf;
		struct ath_vap *avp;
		struct sk_buff *skb;
		int cabq_depth;
		struct ath_txq *cabq;
		struct ieee80211_tx_info *info;
		int cabq_depth;

		avp = sc->sc_vaps[if_id];
		ASSERT(avp);

		cabq = sc->sc_cabq;

		ASSERT(avp);

		if (avp->av_bcbuf == NULL) {
		DPRINTF(sc, ATH_DBG_BEACON, "%s: avp=%p av_bcbuf=%p\n",
		__func__, avp, avp->av_bcbuf);
		return NULL;
		}

		bf = avp->av_bcbuf;
		skb = (struct sk_buff *)bf->bf_mpdu;
		if (skb) {
		@@ -179,6 +179,7 @@ static struct ath_buf ath_beacon_generate(struct ath_softc sc, int if_id)
		bf->bf_mpdu = skb;
		if (skb == NULL)
		return NULL;

		info = IEEE80211_SKB_CB(skb);
		if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
		/*
		@@ -190,6 +191,7 @@ static struct ath_buf ath_beacon_generate(struct ath_softc sc, int if_id)
		hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
		hdr->seq_ctrl \|= cpu_to_le16(sc->seq_no);
		}

		bf->bf_buf_addr = bf->bf_dmacontext =
		pci_map_single(sc->pdev, skb->data,
		skb_end_pointer(skb) - skb->head,
		@@ -241,7 +243,6 @@ static struct ath_buf ath_beacon_generate(struct ath_softc sc, int if_id)
		* Startup beacon transmission for adhoc mode when they are sent entirely
		* by the hardware using the self-linked descriptor + veol trick.
		*/

		static void ath_beacon_start_adhoc(struct ath_softc *sc, int if_id)
		{
		struct ath_hal *ah = sc->sc_ah;
		@@ -278,7 +279,6 @@ static void ath_beacon_start_adhoc(struct ath_softc *sc, int if_id)
		* min/max, and enable aifs). The info structure does not need to be
		* persistant.
		*/

		int ath_beaconq_setup(struct ath_hal *ah)
		{
		struct ath9k_tx_queue_info qi;
		@@ -299,11 +299,10 @@ int ath_beaconq_setup(struct ath_hal *ah)
		* the ATH interface. This routine also calculates the beacon "slot" for
		* staggared beacons in the mBSSID case.
		*/

		int ath_beacon_alloc(struct ath_softc *sc, int if_id)
		{
		struct ath_vap *avp;
		struct ieee80211_hdr *wh;
		struct ieee80211_hdr *hdr;
		struct ath_buf *bf;
		struct sk_buff *skb;

		@@ -312,10 +311,8 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)

		/* Allocate a beacon descriptor if we haven't done so. */
		if (!avp->av_bcbuf) {
		/*
		* Allocate beacon state for hostap/ibss. We know
		* a buffer is available.
		*/
		/* Allocate beacon state for hostap/ibss. We know
		* a buffer is available. */

		avp->av_bcbuf = list_first_entry(&sc->sc_bbuf,
		struct ath_buf, list);
		@@ -362,9 +359,7 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)
		}

		/*
		* NB: the beacon data buffer must be 32-bit aligned;
		* we assume the wbuf routines will return us something
		* with this alignment (perhaps should assert).
		* NB: the beacon data buffer must be 32-bit aligned.
		* FIXME: Fill avp->av_btxctl.txpower and
		* avp->av_btxctl.shortPreamble
		*/
		@@ -408,8 +403,8 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)
		__func__, "stagger",
		avp->av_bslot, intval, (unsigned long long)tsfadjust);

		wh = (struct ieee80211_hdr *)skb->data;
		memcpy(&wh[1], &val, sizeof(val));
		hdr = (struct ieee80211_hdr *)skb->data;
		memcpy(&hdr[1], &val, sizeof(val));
		}

		bf->bf_buf_addr = bf->bf_dmacontext =
		@@ -425,9 +420,8 @@ int ath_beacon_alloc(struct ath_softc *sc, int if_id)
		* Reclaim beacon resources and return buffer to the pool.
		*
		* Checks the VAP to put the beacon frame buffer back to the ATH object
		* queue, and de-allocates any wbuf frames that were sent as CAB traffic.
		* queue, and de-allocates any skbs that were sent as CAB traffic.
		*/

		void ath_beacon_return(struct ath_softc sc, struct ath_vap avp)
		{
		if (avp->av_bcbuf != NULL) {
		@@ -459,10 +453,7 @@ void ath_beacon_return(struct ath_softc sc, struct ath_vap avp)
		* Transmit one or more beacon frames at SWBA. Dynamic updates to the frame
		* contents are done as needed and the slot time is also adjusted based on
		* current state.
		*
		* This tasklet is not scheduled, it's called in ISR context.
		*/

		void ath9k_beacon_tasklet(unsigned long data)
		{
		struct ath_softc sc = (struct ath_softc )data;
		@@ -490,6 +481,8 @@ void ath9k_beacon_tasklet(unsigned long data)
		* and wait for the next. Missed beacons indicate
		* a problem and should not occur. If we miss too
		* many consecutive beacons reset the device.
		*
		* FIXME: Clean up this mess !!
		*/
		if (ath9k_hw_numtxpending(ah, sc->sc_bhalq) != 0) {
		sc->sc_bmisscount++;
		@@ -505,19 +498,16 @@ void ath9k_beacon_tasklet(unsigned long data)
		__func__, sc->sc_bmisscount);
		if (show_cycles) {
		/*
		* Display cycle counter stats
		* from HW to aide in debug of
		* stickiness.
		* Display cycle counter stats from HW
		* to aide in debug of stickiness.
		*/
		DPRINTF(sc,
		ATH_DBG_BEACON,
		DPRINTF(sc, ATH_DBG_BEACON,
		"%s: busy times: rx_clear=%d, "
		"rx_frame=%d, tx_frame=%d\n",
		__func__, rx_clear, rx_frame,
		tx_frame);
		} else {
		DPRINTF(sc,
		ATH_DBG_BEACON,
		DPRINTF(sc, ATH_DBG_BEACON,
		"%s: unable to obtain "
		"busy times\n", __func__);
		}
		@@ -529,8 +519,7 @@ void ath9k_beacon_tasklet(unsigned long data)
		} else if (sc->sc_bmisscount >= BSTUCK_THRESH) {
		if (sc->sc_flags & SC_OP_NO_RESET) {
		if (sc->sc_bmisscount == BSTUCK_THRESH) {
		DPRINTF(sc,
		ATH_DBG_BEACON,
		DPRINTF(sc, ATH_DBG_BEACON,
		"%s: beacon is officially "
		"stuck\n", __func__);
		ath9k_hw_dmaRegDump(ah);
		@@ -542,13 +531,12 @@ void ath9k_beacon_tasklet(unsigned long data)
		ath_bstuck_process(sc);
		}
		}

		return;
		}

		if (sc->sc_bmisscount != 0) {
		if (sc->sc_flags & SC_OP_NO_RESET) {
		DPRINTF(sc,
		ATH_DBG_BEACON,
		DPRINTF(sc, ATH_DBG_BEACON,
		"%s: resume beacon xmit after %u misses\n",
		__func__, sc->sc_bmisscount);
		} else {
		@@ -572,10 +560,12 @@ void ath9k_beacon_tasklet(unsigned long data)
		tsftu = TSF_TO_TU(tsf>>32, tsf);
		slot = ((tsftu % intval) * ATH_BCBUF) / intval;
		if_id = sc->sc_bslot[(slot + 1) % ATH_BCBUF];

		DPRINTF(sc, ATH_DBG_BEACON,
		"%s: slot %d [tsf %llu tsftu %u intval %u] if_id %d\n",
		__func__, slot, (unsigned long long)tsf, tsftu,
		intval, if_id);

		bfaddr = 0;
		if (if_id != ATH_IF_ID_ANY) {
		bf = ath_beacon_generate(sc, if_id);
		@@ -632,9 +622,8 @@ void ath9k_beacon_tasklet(unsigned long data)
		* Tasklet for Beacon Stuck processing
		*
		* Processing for Beacon Stuck.
		* Basically calls the ath_internal_reset function to reset the chip.
		* Basically resets the chip.
		*/

		void ath_bstuck_process(struct ath_softc *sc)
		{
		DPRINTF(sc, ATH_DBG_BEACON,
		@@ -658,13 +647,12 @@ void ath_bstuck_process(struct ath_softc *sc)
		* interrupt when we stop seeing beacons from the AP
		* we've associated with.
		*/

		void ath_beacon_config(struct ath_softc *sc, int if_id)
		{
		struct ath_hal *ah = sc->sc_ah;
		u32 nexttbtt, intval;
		struct ath_beacon_config conf;
		enum ath9k_opmode av_opmode;
		u32 nexttbtt, intval;

		if (if_id != ATH_IF_ID_ANY)
		av_opmode = sc->sc_vaps[if_id]->av_opmode;
		@@ -673,12 +661,6 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)

		memzero(&conf, sizeof(struct ath_beacon_config));

		/* FIXME: Use default values for now - Sujith */
		/* Query beacon configuration first */
		/*
		* Protocol stack doesn't support dynamic beacon configuration,
		* use default configurations.
		*/
		conf.beacon_interval = sc->hw->conf.beacon_int ?
		sc->hw->conf.beacon_int : ATH_DEFAULT_BINTVAL;
		conf.listen_interval = 1;
		@@ -708,8 +690,10 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)
		nexttbtt = intval;
		else if (intval) /* NB: can be 0 for monitor mode */
		nexttbtt = roundup(nexttbtt, intval);

		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_ah->ah_opmode == ATH9K_M_STA) {
		struct ath9k_beacon_state bs;
		@@ -727,7 +711,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)
		dtimperiod = 1;
		dtimcount = conf.dtim_count;
		if (dtimcount >= dtimperiod) /* NB: sanity check */
		dtimcount = 0; /* XXX? */
		dtimcount = 0;
		cfpperiod = 1; /* NB: no PCF support yet */
		cfpcount = 0;

		@@ -759,6 +743,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)
		bs.bs_cfpperiod = cfpperiod*bs.bs_dtimperiod;
		bs.bs_cfpnext = bs.bs_nextdtim + cfpcount*bs.bs_dtimperiod;
		bs.bs_cfpmaxduration = 0;

		/*
		* Calculate the number of consecutive beacons to miss
		* before taking a BMISS interrupt. The configuration
		@@ -767,8 +752,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)
		* result to at most 15 beacons.
		*/
		if (sleepduration > intval) {
		bs.bs_bmissthreshold =
		conf.listen_interval *
		bs.bs_bmissthreshold = conf.listen_interval *
		ATH_DEFAULT_BMISS_LIMIT / 2;
		} else {
		bs.bs_bmissthreshold =
		@@ -789,8 +773,8 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)
		* XXX fixed at 100ms
		*/

		bs.bs_sleepduration =
		roundup(IEEE80211_MS_TO_TU(100), sleepduration);
		bs.bs_sleepduration = roundup(IEEE80211_MS_TO_TU(100),
		sleepduration);
		if (bs.bs_sleepduration > bs.bs_dtimperiod)
		bs.bs_sleepduration = bs.bs_dtimperiod;

		@@ -834,7 +818,7 @@ void ath_beacon_config(struct ath_softc *sc, int if_id)
		if (sc->sc_ah->ah_opmode == ATH9K_M_IBSS) {
		/*
		* Pull nexttbtt forward to reflect the current
		* TSF .
		* TSF
		*/
		#define FUDGE 2
		if (!(intval & ATH9K_BEACON_RESET_TSF)) {