X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_ath.c;h=b31fbdb67e866d883732f14ca4171515015bbfbd;hb=83dd3bf0aae9da59ecb39852500f5e25adddef27;hp=864f48f8229f47f919d96aea4aa3dea33b2c30af;hpb=3ab79b4a8e895983a5701b08e767c1e9ff9f622a;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 864f48f..b31fbdb 100755
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -56,6 +56,8 @@
 #include "if_athvar.h"
 #include "ah_desc.h"
 #include "ah.h"
+#include "ratectrl.h"
+#include "ah_internal.h"
 
 static a_int32_t ath_numrxbufs = -1;
 static a_int32_t ath_numrxdescs = -1;
@@ -82,26 +84,36 @@ void ath_tgt_tx_sched_normal(struct ath_softc_tgt *sc, struct ath_buf *bf);
 void ath_tgt_tx_sched_nonaggr(struct ath_softc_tgt *sc,struct ath_buf * bf_host);
 
 /*
- * Extend a 32 bit TSF to 64 bit, taking wrapping into account.
+ * Extend a 32 bit TSF to nearest 64 bit TSF value.
+ * When the adapter is a STATION, its local TSF is periodically modified by
+ * the hardware to match the BSS TSF (as received in beacon packets), and
+ * rstamp may appear to be from the future or from the past (with reference
+ * to the current local TSF) because of jitter. This is mostly noticable in
+ * highly congested channels. The code uses signed modulo arithmetic to
+ * handle both past/future cases and signed-extension to avoid branches.
+ * Test cases:
+ * extend(0x0000001200000004, 0x00000006) == 0x0000001200000006
+ * extend(0x0000001200000004, 0x00000002) == 0x0000001200000002
+ * extend(0x0000001200000004, 0xfffffffe) == 0x00000011fffffffe  ! tsfhigh--
+ * extend(0x000000127ffffffe, 0x80000002) == 0x0000001280000002
+ * extend(0x0000001280000002, 0x7ffffffe) == 0x000000127ffffffe
+ * extend(0x00000012fffffffc, 0xfffffffe) == 0x00000012fffffffe
+ * extend(0x00000012fffffffc, 0xfffffffa) == 0x00000012fffffffa
+ * extend(0x00000012fffffffc, 0x00000002) == 0x0000001300000002  ! tsfhigh++
  */
 static u_int64_t ath_extend_tsf(struct ath_softc_tgt *sc, u_int32_t rstamp)
 {
 	struct ath_hal *ah = sc->sc_ah;
 	u_int64_t tsf;
 	u_int32_t tsf_low;
-	u_int64_t tsf64;
+	a_int64_t tsf_delta;  /* signed int64 */
 
 	tsf = ah->ah_getTsf64(ah);
-	tsf_low = tsf & 0xffffffff;
-	tsf64 = (tsf & ~0xffffffffULL) | rstamp;
+	tsf_low = tsf & 0xffffffffUL;
 
-	if (rstamp > tsf_low && (rstamp - tsf_low > 0x10000000))
-		tsf64 -= 0x100000000ULL;
+	tsf_delta = (a_int32_t)((rstamp - tsf_low) & 0xffffffffUL);
 
-	if (rstamp < tsf_low && (tsf_low - rstamp > 0x10000000))
-		tsf64 += 0x100000000ULL;
-
-	return tsf64;
+	return (tsf + (u_int64_t)tsf_delta);
 }
 
 static a_int32_t ath_rate_setup(struct ath_softc_tgt *sc, a_uint32_t mode)
@@ -317,13 +329,11 @@ static void ath_uapsd_processtriggers(struct ath_softc_tgt *sc)
 	a_int32_t retval;
 	a_uint32_t cnt = 0;
 	a_uint16_t frame_len = 0;
-	a_uint64_t tsf;
 
 #define	PA2DESC(_sc, _pa)						\
 	((struct ath_desc *)((caddr_t)(_sc)->sc_rxdma.dd_desc +		\
 			     ((_pa) - (_sc)->sc_rxdma.dd_desc_paddr)))
 
-	tsf = ah->ah_getTsf64(ah);
 	bf = asf_tailq_first(&sc->sc_rxbuf);
 
 	ds = asf_tailq_first(&sc->sc_rxdesc);
@@ -574,9 +584,7 @@ static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
 	struct ath_tx_buf *bf;
 	a_uint8_t vap_index, *anbdata;
 	ath_beacon_hdr_t *bhdr;
-	struct ieee80211vap_target  *vap;
 	a_uint32_t anblen;
-	struct ieee80211_frame *wh;
 
 	if (!bc_hdr) {
 		adf_nbuf_peek_header(nbuf, &anbdata, &anblen);
@@ -587,10 +595,8 @@ static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
 
 	vap_index = bhdr->vap_index;
 	adf_os_assert(vap_index < TARGET_VAP_MAX);
-	vap = &sc->sc_vap[vap_index].av_vap;
 
-	wh = (struct ieee80211_frame *)adf_nbuf_pull_head(nbuf,
-						  sizeof(ath_beacon_hdr_t));
+	adf_nbuf_pull_head(nbuf, sizeof(ath_beacon_hdr_t));
 
 	bf = sc->sc_vap[vap_index].av_bcbuf;
 	adf_os_assert(bf);
@@ -864,7 +870,6 @@ static void ath_descdma_cleanup(struct ath_softc_tgt *sc,
 				ath_bufhead *head, a_int32_t dir)
 {
 	struct ath_buf *bf;
-	struct ieee80211_node_target *ni;
 
 	asf_tailq_foreach(bf, head, bf_list) {
 		if (adf_nbuf_queue_len(&bf->bf_skbhead) != 0) {
@@ -882,7 +887,6 @@ static void ath_descdma_cleanup(struct ath_softc_tgt *sc,
 
 		adf_nbuf_dmamap_destroy(sc->sc_dev, bf->bf_dmamap);
 
-		ni = bf->bf_node;
 		bf->bf_node = NULL;
 	}
 
@@ -1094,9 +1098,9 @@ static void ath_enable_intr_tgt(void *Context, A_UINT16 Command,
 {
 	struct ath_softc_tgt *sc = (struct ath_softc_tgt *)Context;
 	struct ath_hal *ah = sc->sc_ah;
-	a_uint32_t intr;
+	a_uint32_t intr = 0;
 
-	if (data)
+	if (datalen == 4)
 		intr = (*(a_uint32_t *)data);
 
 	intr = adf_os_ntohl(intr);