redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: rl8723au: rtw_make_wlanhdr(): Use ieee80211_qos_hdr

Browse source 
Use the kernel provided struct and defines to fill in qos_ctrl

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-05-21 09:38:05 +02:00 committed by Greg Kroah-Hartman
parent ec3f4e2ae1
commit e5b2a429f0
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/staging/rtl8723au/core/rtw_xmit.c
View file

@ -861,9 +861,8 @@ static int xmitframe_swencrypt(struct rtw_adapter *padapter,
static int rtw_make_wlanhdr(struct rtw_adapter *padapter, u8 *hdr,
struct pkt_attrib *pattrib)
{
u16 *qc;
struct ieee80211_hdr *pwlanhdr = (struct ieee80211_hdr *)hdr;
struct ieee80211_qos_hdr *qoshdr;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 qos_option = false;
int res = _SUCCESS;
@ -942,11 +941,18 @@ static int rtw_make_wlanhdr(struct rtw_adapter *padapter, u8 *hdr,
pwlanhdr->frame_control |=
cpu_to_le16(IEEE80211_FCTL_PROTECTED);
if (qos_option) {
qc = (unsigned short *)(hdr + pattrib->hdrlen - 2);
if (pattrib->priority)
SetPriority(qc, pattrib->priority);
SetEOSP(qc, pattrib->eosp);
SetAckpolicy(qc, pattrib->ack_policy);
qoshdr = (struct ieee80211_qos_hdr *)hdr;
qoshdr->qos_ctrl = cpu_to_le16(
pattrib->priority & IEEE80211_QOS_CTL_TID_MASK);
qoshdr->qos_ctrl |= cpu_to_le16(
(pattrib->ack_policy << 5) &
IEEE80211_QOS_CTL_ACK_POLICY_MASK);
if (pattrib->eosp)
qoshdr->qos_ctrl |=
cpu_to_le16(IEEE80211_QOS_CTL_EOSP);
}
/* TODO: fill HT Control Field */