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

Commit 21fbbca3 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

ath9k: report A-MPDU status 



The ath9k hardware reports whenever an frame was part
of an A-MPDU. MAC80211 already provides the necessary
API to pass this additional information along to
whomever needs it.

Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cd435d56

drivers/net/wireless/ath/ath9k/ath9k.h

+2 −0
Original line number Diff line number Diff line
@@ -319,6 +319,8 @@ struct ath_rx { 
	struct ath_rx_edma rx_edma[ATH9K_RX_QUEUE_MAX];



	struct sk_buff *frag;



	u32 ampdu_ref;

};



int ath_startrecv(struct ath_softc *sc);

drivers/net/wireless/ath/ath9k/recv.c

+20 −0
Original line number Diff line number Diff line
@@ -1123,6 +1123,24 @@ static int ath_process_fft(struct ath_softc *sc, struct ieee80211_hdr *hdr, 
#endif

}



static void ath9k_apply_ampdu_details(struct ath_softc *sc,

	struct ath_rx_status *rs, struct ieee80211_rx_status *rxs)

{

	if (rs->rs_isaggr) {

		rxs->flag |= RX_FLAG_AMPDU_DETAILS | RX_FLAG_AMPDU_LAST_KNOWN;



		rxs->ampdu_reference = sc->rx.ampdu_ref;



		if (!rs->rs_moreaggr) {

			rxs->flag |= RX_FLAG_AMPDU_IS_LAST;

			sc->rx.ampdu_ref++;

		}



		if (rs->rs_flags & ATH9K_RX_DELIM_CRC_PRE)

			rxs->flag |= RX_FLAG_AMPDU_DELIM_CRC_ERROR;

	}

}



int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)

{

	struct ath_buf *bf;
@@ -1329,6 +1347,8 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) 
		if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx == 3)

			ath_ant_comb_scan(sc, &rs);



		ath9k_apply_ampdu_details(sc, &rs, rxs);



		ieee80211_rx(hw, skb);



requeue_drop_frag: