ath9k: fix moredata flag endianness in cabq tx
authorMichal Kazior <michal.kazior@tieto.com>
Thu, 9 Jul 2015 10:27:22 +0000 (12:27 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 21 Jul 2015 15:01:35 +0000 (18:01 +0300)
While compiling ath9k with some extra flags I've
found that:

 ath9k/xmit.c +2473 ## 16: warning: restricted __le16 degrades to integer
 ath9k/xmit.c +2474 ## 36: warning: invalid assignment: &=
 ath9k/xmit.c +2474 ## 36:    left side has type restricted __le16
 ath9k/xmit.c +2474 ## 36:    right side has type int

There's no way for frame ftype/stype to be
mistreated as the offending 'moredata' flag when
considering cab queue.

This could've however theoretically led sometimes
to increased power consumption on connected
stations as they would keep their Rx active
waiting for frames that would never come.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/ath/ath9k/xmit.c

index 2c627f1233da6514b365ea923c84a1f36552965c..b766a7fc60aaa051a519ed18830444322e98d4b3 100644 (file)
@@ -2473,8 +2473,8 @@ void ath_tx_cabq(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        bf = list_first_entry(&bf_q, struct ath_buf, list);
        hdr = (struct ieee80211_hdr *) bf->bf_mpdu->data;
 
-       if (hdr->frame_control & IEEE80211_FCTL_MOREDATA) {
-               hdr->frame_control &= ~IEEE80211_FCTL_MOREDATA;
+       if (hdr->frame_control & cpu_to_le16(IEEE80211_FCTL_MOREDATA)) {
+               hdr->frame_control &= ~cpu_to_le16(IEEE80211_FCTL_MOREDATA);
                dma_sync_single_for_device(sc->dev, bf->bf_buf_addr,
                        sizeof(*hdr), DMA_TO_DEVICE);
        }