From: Adrian Chadd Date: Fri, 16 Dec 2016 19:49:28 +0000 (-0800) Subject: Merge pull request #119 from olerem/rate-2016.12.16.1 X-Git-Url: https://jxself.org/git/?p=open-ath9k-htc-firmware.git;a=commitdiff_plain;h=ef9a749691ea03130179e0a0f991822a341e0f15;hp=38a12178321ace47a200e5c9820d897a9029db79 Merge pull request #119 from olerem/rate-2016.12.16.1 use minimal unmasked rate for multicast frames. --- diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c index b31fbdb..cf92262 100755 --- a/target_firmware/wlan/if_ath.c +++ b/target_firmware/wlan/if_ath.c @@ -759,6 +759,7 @@ static void tgt_HTCRecvMessageHandler(HTC_ENDPOINT_ID EndPt, bf->bf_endpt = EndPt; bf->bf_cookie = dh->cookie; + bf->vap_index = dh->vap_index; if (tid->flag & TID_AGGR_ENABLED) ath_tgt_handle_aggr(sc, bf); diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h index 40f9ffe..7826869 100755 --- a/target_firmware/wlan/if_athvar.h +++ b/target_firmware/wlan/if_athvar.h @@ -225,6 +225,7 @@ struct ath_tx_buf HTC_ENDPOINT_ID bf_endpt; a_uint16_t al_delta; a_uint8_t bf_cookie; + a_uint8_t vap_index; }; struct ath_rx_buf diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c index f228069..6dda78c 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));