From: Jes Sorensen Date: Wed, 21 May 2014 07:38:04 +0000 (+0200) Subject: staging: rtl8723au: rtl8723a_cmd.c: Use ieee80211.h defines to set qos_ctrl X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ec3f4e2ae1efc43ac8b63bd31877f86fffecd2c7;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git staging: rtl8723au: rtl8723a_cmd.c: Use ieee80211.h defines to set qos_ctrl Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c index dc044cf4031d..eb747d602f88 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c @@ -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 {