mac80211: fix TX sequence numbers

[cascardo/linux.git] / drivers / net / wireless / b43legacy / xmit.c

diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index 82dc04d..e969ed8 100644 (file)
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -295,8 +295,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
        /* MAC control */
        if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
                mac_ctl |= B43legacy_TX4_MAC_ACK;
-       if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
-             ((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)))
+       if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
                mac_ctl |= B43legacy_TX4_MAC_HWSEQ;
        if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
                mac_ctl |= B43legacy_TX4_MAC_STMSDU;
@@ -442,7 +441,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
        struct b43legacy_plcp_hdr6 *plcp;
        struct ieee80211_hdr *wlhdr;
        const struct b43legacy_rxhdr_fw3 *rxhdr = _rxhdr;
-       u16 fctl;
+       __le16 fctl;
        u16 phystat0;
        u16 phystat3;
        u16 chanstat;
@@ -480,7 +479,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
                goto drop;
        }
        wlhdr = (struct ieee80211_hdr *)(skb->data);
-       fctl = le16_to_cpu(wlhdr->frame_control);
+       fctl = wlhdr->frame_control;
 
        if ((macstat & B43legacy_RX_MAC_DEC) &&
            !(macstat & B43legacy_RX_MAC_DECERR)) {
@@ -499,11 +498,11 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
 
                if (dev->key[keyidx].algorithm != B43legacy_SEC_ALGO_NONE) {
                        /* Remove PROTECTED flag to mark it as decrypted. */
-                       B43legacy_WARN_ON(!(fctl & IEEE80211_FCTL_PROTECTED));
-                       fctl &= ~IEEE80211_FCTL_PROTECTED;
-                       wlhdr->frame_control = cpu_to_le16(fctl);
+                       B43legacy_WARN_ON(!ieee80211_has_protected(fctl));
+                       fctl &= ~cpu_to_le16(IEEE80211_FCTL_PROTECTED);
+                       wlhdr->frame_control = fctl;
 
-                       wlhdr_len = ieee80211_get_hdrlen(fctl);
+                       wlhdr_len = ieee80211_hdrlen(fctl);
                        if (unlikely(skb->len < (wlhdr_len + 3))) {
                                b43legacydbg(dev->wl, "RX: Packet size"
                                             " underrun3\n");
@@ -556,9 +555,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
         * of timestamp, i.e. about 65 milliseconds after the PHY received
         * the first symbol.
         */
-       if (((fctl & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE))
-           == (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON)) ||
-           dev->wl->radiotap_enabled) {
+       if (ieee80211_is_beacon(fctl) || dev->wl->radiotap_enabled) {
                u16 low_mactime_now;
 
                b43legacy_tsf_read(dev, &status.mactime);