[PATCH 1/6] ath9k: Fix bug in assigning sequence number

[PATCH 1/6] ath9k: Fix bug in assigning sequence number

[Sujith]

The internal, driver-specific maintenance of sequence
numbers is applicable only for HT frames.

Also, remove comments that are not relevant anymore.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
---
 drivers/net/wireless/ath/ath9k/xmit.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 2a11cc5..c56f4ac 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1414,17 +1414,9 @@ static void assign_aggr_tid_seqno(struct sk_buff *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);
+	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);
 }
@@ -1636,7 +1628,8 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf,
 		bf->bf_keyix = ATH9K_TXKEYIX_INVALID;
 	}
 
-	if (ieee80211_is_data_qos(fc) && (sc->sc_flags & SC_OP_TXAGGR))
+	if (ieee80211_is_data_qos(fc) && bf_isht(bf) &&
+	    (sc->sc_flags & SC_OP_TXAGGR))
 		assign_aggr_tid_seqno(skb, bf);
 
 	bf->bf_mpdu = skb;
-- 
1.6.5.6

Re: [PATCH 1/6] ath9k: Fix bug in assigning sequence number

[Luis R. Rodriguez]

On Mon, Dec 14, 2009 at 1:26 AM, Sujith <Sujith.Manoharan@atheros.com> wrote:
> The internal, driver-specific maintenance of sequence
> numbers is applicable only for HT frames.
>
> Also, remove comments that are not relevant anymore.
>
> Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>

Is this cc: stable?

  Luis

Re: [PATCH 1/6] ath9k: Fix bug in assigning sequence number

[Luis R. Rodriguez]

On Mon, Dec 14, 2009 at 6:58 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> On Mon, Dec 14, 2009 at 1:26 AM, Sujith <Sujith.Manoharan@atheros.com> wrote:
>> The internal, driver-specific maintenance of sequence
>> numbers is applicable only for HT frames.
>>
>> Also, remove comments that are not relevant anymore.
>>
>> Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
>
> Is this cc: stable?

Also what bug does this fix, the commit log in no way explains any of this.

  Luis

Re: [PATCH 1/6] ath9k: Fix bug in assigning sequence number

[Sujith]

Luis R. Rodriguez wrote:
> On Mon, Dec 14, 2009 at 1:26 AM, Sujith <Sujith.Manoharan@atheros.com> wrote:
> > The internal, driver-specific maintenance of sequence
> > numbers is applicable only for HT frames.
> >
> > Also, remove comments that are not relevant anymore.
> >
> > Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
> 
> Is this cc: stable?

No, this bug has been in the code forever.

Sujith

Re: [PATCH 1/6] ath9k: Fix bug in assigning sequence number

[Sujith]

Luis R. Rodriguez wrote:
> On Mon, Dec 14, 2009 at 6:58 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> > On Mon, Dec 14, 2009 at 1:26 AM, Sujith <Sujith.Manoharan@atheros.com> wrote:
> >> The internal, driver-specific maintenance of sequence
> >> numbers is applicable only for HT frames.
> >>
> >> Also, remove comments that are not relevant anymore.
> >>
> >> Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
> >
> > Is this cc: stable?
> 
> Also what bug does this fix, the commit log in no way explains any of this.

The patch just removes redundant maintenance of sequence numbers in the code.

Sujith