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

Commit d3a1db1c authored by Senthil Balasubramanian's avatar Senthil Balasubramanian Committed by John W. Linville
Browse files

ath9k: Fix incorrect sequence numbering for unaggregated QoS Frame. 



This patch fixes an issue with the sequence numbers of unaggregated
QoS frames, because of which the frames are handled in a different order
at the AP and resulted in MLME REPLAYFAILURE.

Signed-off-by: default avatarSenthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f3d340c1

drivers/net/wireless/ath9k/xmit.c

+17 −21
Original line number Diff line number Diff line
@@ -264,8 +264,6 @@ static void assign_aggr_tid_seqno(struct sk_buff *skb, 
	}



	/* Get seqno */



	if (ieee80211_is_data(fc) && !is_pae(skb)) {

	/* For HT capable stations, we save tidno for later use.

	 * We also override seqno set by upper layer with the one

	 * in tx aggregation state.
@@ -283,7 +281,6 @@ static void assign_aggr_tid_seqno(struct sk_buff *skb, 
	bf->bf_seqno = tid->seq_next;

	INCR(tid->seq_next, IEEE80211_SEQ_MAX);

}

}



static int setup_tx_flags(struct ath_softc *sc, struct sk_buff *skb,

			  struct ath_txq *txq)
@@ -1718,11 +1715,10 @@ static int ath_tx_setup_buffer(struct ath_softc *sc, struct ath_buf *bf, 


	/* Assign seqno, tidno */



	if (bf_isht(bf) && (sc->sc_flags & SC_OP_TXAGGR))

	if (ieee80211_is_data_qos(fc) && (sc->sc_flags & SC_OP_TXAGGR))

		assign_aggr_tid_seqno(skb, bf);



	/* DMA setup */



	bf->bf_mpdu = skb;



	bf->bf_dmacontext = pci_map_single(sc->pdev, skb->data,