staging: rtl8723au: rtl8723a_cmd.c: Use ieee80211.h defines to set qos_ctrl
authorJes Sorensen <Jes.Sorensen@redhat.com>
Wed, 21 May 2014 07:38:04 +0000 (09:38 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 May 2014 07:27:47 +0000 (16:27 +0900)
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723au/hal/rtl8723a_cmd.c

index dc044cf4031d3b6b97a04aadb634c5b8c1d04eef..eb747d602f883c57f2dec5b4b0712b5a222cb86b 100644 (file)
@@ -383,13 +383,14 @@ ConstructNullFunctionData(struct rtw_adapter *padapter, u8 *pframe,
        }
 
        if (bQoS == true) {
-               struct ieee80211_qos_hdr *pwlanqoshdr;
+               struct ieee80211_qos_hdr *qoshdr;
+               qoshdr = (struct ieee80211_qos_hdr *)pframe;
 
                SetFrameSubType(pframe, WIFI_QOS_DATA_NULL);
 
-               pwlanqoshdr = (struct ieee80211_qos_hdr *)pframe;
-               SetPriority(&pwlanqoshdr->qos_ctrl, AC);
-               SetEOSP(&pwlanqoshdr->qos_ctrl, bEosp);
+               qoshdr->qos_ctrl = cpu_to_le16(AC & IEEE80211_QOS_CTL_TID_MASK);
+               if (bEosp)
+                       qoshdr->qos_ctrl |= cpu_to_le16(IEEE80211_QOS_CTL_EOSP);
 
                pktlen = sizeof(struct ieee80211_qos_hdr);
        } else {