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: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index 3bfc3b90f2569013092e82959a03bfebdf39b979..1ea9428c0cd21bf22c9433cef4e7287017e8f67c 100644 (file)
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -264,25 +264,22 @@ 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.
-                *
-                * If fragmentation is on, the sequence number is
-                * not overridden, since it has been
-                * incremented by the fragmentation routine.
-                *
-                * FIXME: check if the fragmentation threshold exceeds
-                * IEEE80211 max.
-                */
-               tid = ATH_AN_2_TID(an, bf->bf_tidno);
-               hdr->seq_ctrl = cpu_to_le16(tid->seq_next <<
-                                           IEEE80211_SEQ_SEQ_SHIFT);
-               bf->bf_seqno = tid->seq_next;
-               INCR(tid->seq_next, IEEE80211_SEQ_MAX);
-       }
+       /* 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.
+        *
+        * If fragmentation is on, the sequence number is
+        * not overridden, since it has been
+        * incremented by the fragmentation routine.
+        *
+        * FIXME: check if the fragmentation threshold exceeds
+        * IEEE80211 max.
+        */
+       tid = ATH_AN_2_TID(an, bf->bf_tidno);
+       hdr->seq_ctrl = cpu_to_le16(tid->seq_next <<
+                       IEEE80211_SEQ_SEQ_SHIFT);
+       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,
@@ -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,