X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_owl.c;h=919a4784f9e0c4339f751b7ff0666b0938cc4068;hb=HEAD;hp=da65461a21dd72dbceafd7efbb62aeb8bca167ad;hpb=c6ce9d3cba6451b379144440c420132efde28c5a;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index da65461..919a478 100755
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -969,9 +969,13 @@ ath_tgt_tx_send_normal(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 				      rcs, &isProbe);
 		ath_hal_memcpy(bf->bf_rcs, rcs, sizeof(rcs));
 	} else {
+		struct ath_vap_target *avp;
+
+		avp = &sc->sc_vap[bf->vap_index];
+
 		mrcs[1].tries = mrcs[2].tries = mrcs[3].tries = 0;
 		mrcs[1].rix = mrcs[2].rix = mrcs[3].rix = 0;
-		mrcs[0].rix   = 0;
+		mrcs[0].rix = ath_get_minrateidx(sc, avp);
 		mrcs[0].tries = 1;
 		mrcs[0].flags = 0;
 		ath_hal_memcpy(bf->bf_rcs, mrcs, sizeof(mrcs));
@@ -1023,13 +1027,15 @@ static void
 ath_update_stats(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 {
 	struct ath_tx_desc *ds = bf->bf_desc;
+	struct ieee80211_frame *wh = ATH_SKB2_WH(bf->bf_skb);
 	u_int32_t sr, lr;
 
 	if (ds->ds_txstat.ts_status == 0) {
 		if (ds->ds_txstat.ts_rate & HAL_TXSTAT_ALTRATE)
 			sc->sc_tx_stats.ast_tx_altrate++;
 	} else {
-		if (ds->ds_txstat.ts_status & HAL_TXERR_XRETRY)
+		if (ds->ds_txstat.ts_status & HAL_TXERR_XRETRY &&
+		    !IEEE80211_IS_MULTICAST(wh->i_addr1))
 			sc->sc_tx_stats.ast_tx_xretries++;
 		if (ds->ds_txstat.ts_status & HAL_TXERR_FIFO)
 			sc->sc_tx_stats.ast_tx_fifoerr++;
@@ -1102,7 +1108,6 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
 	hdrlen = ieee80211_anyhdrsize(wh);
 	pktlen = len;
 	keyix = HAL_TXKEYIX_INVALID;
-	pktlen -= (hdrlen & 3);
 	pktlen += IEEE80211_CRC_LEN;
 
 	if (iswep)
@@ -1136,6 +1141,8 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
 			atype = HAL_PKT_TYPE_NORMAL;
 
 		break;
+	case IEEE80211_FC0_TYPE_CTL:
+		flags |= HAL_TXDESC_NOACK;
 	default:
 		atype = HAL_PKT_TYPE_NORMAL;
 		break;