]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
p54: fix sequence no. accounting off-by-one error
authorChristian Lamparter <chunkeey@googlemail.com>
Thu, 6 Jan 2011 22:47:52 +0000 (23:47 +0100)
committerAK <andi@firstfloor.org>
Thu, 31 Mar 2011 18:57:50 +0000 (11:57 -0700)
commit 3b5c5827d1f80ad8ae844a8b1183f59ddb90fe25 upstream.

P54_HDR_FLAG_DATA_OUT_SEQNR is meant to tell the
firmware that "the frame's sequence number has
already been set by the application."

Whereas IEEE80211_TX_CTL_ASSIGN_SEQ is set for
frames which lack a valid sequence number and
either the driver or firmware has to assign one.

Yup, it's the exact opposite!

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
drivers/net/wireless/p54/txrx.c

index ccb2dd1bf0234b5e05410321940be5f0bf8383a1..9ad0f5f0c8844a49c0619f9e7467c6cd7798059c 100644 (file)
@@ -616,7 +616,7 @@ static void p54_tx_80211_header(struct p54_common *priv, struct sk_buff *skb,
        else
                *burst_possible = false;
 
-       if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
+       if (!(info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))
                *flags |= P54_HDR_FLAG_DATA_OUT_SEQNR;
 
        if (info->flags & IEEE80211_TX_CTL_PSPOLL_RESPONSE)