openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8723au: Get rid of SetPrivacy()/SetPwrMgt()/SetMData() macros 

Set these bits directly in the code instead of fiddling with wrapper
macros.

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:02 +02:00 committed by Greg Kroah-Hartman
parent fd602993ba
commit c6716e1f84
4 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
View File

@ -3091,7 +3091,8 @@ void issue_auth23a(struct rtw_adapter *padapter, struct sta_info *psta,
pmlmeinfo->chg_txt, pmlmeinfo->chg_txt,
&pattrib->pktlen); &pattrib->pktlen);
SetPrivacy(fctrl); pwlanhdr->frame_control |=
cpu_to_le16(IEEE80211_FCTL_PROTECTED);
pattrib->hdrlen = sizeof(struct ieee80211_hdr_3addr); pattrib->hdrlen = sizeof(struct ieee80211_hdr_3addr);
@ -3573,7 +3574,7 @@ static int _issue_nulldata23a(struct rtw_adapter *padapter, unsigned char *da,
SetToDs(fctrl); SetToDs(fctrl);
if (power_mode) if (power_mode)
SetPwrMgt(fctrl); pwlanhdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);
ether_addr_copy(pwlanhdr->addr1, da); ether_addr_copy(pwlanhdr->addr1, da);
ether_addr_copy(pwlanhdr->addr2, myid(&padapter->eeprompriv)); ether_addr_copy(pwlanhdr->addr2, myid(&padapter->eeprompriv));
@ -3697,7 +3698,7 @@ static int _issue_qos_nulldata23a(struct rtw_adapter *padapter,
SetToDs(fctrl); SetToDs(fctrl);
if (pattrib->mdata) if (pattrib->mdata)
SetMData(fctrl); pwlanhdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);
qc = (unsigned short *)(pframe + pattrib->hdrlen - 2); qc = (unsigned short *)(pframe + pattrib->hdrlen - 2);

6
drivers/staging/rtl8723au/core/rtw_xmit.c
View File

@ -936,9 +936,11 @@ static int rtw_make_wlanhdr(struct rtw_adapter *padapter, u8 *hdr,
goto exit; goto exit;
} }
if (pattrib->mdata) if (pattrib->mdata)
SetMData(fctrl); pwlanhdr->frame_control |=
cpu_to_le16(IEEE80211_FCTL_MOREDATA);
if (pattrib->encrypt) if (pattrib->encrypt)
SetPrivacy(fctrl); pwlanhdr->frame_control |=
cpu_to_le16(IEEE80211_FCTL_PROTECTED);
if (qos_option) { if (qos_option) {
qc = (unsigned short *)(hdr + pattrib->hdrlen - 2); qc = (unsigned short *)(hdr + pattrib->hdrlen - 2);
if (pattrib->priority) if (pattrib->priority)

7
drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
View File

@ -310,16 +310,13 @@ static void ConstructPSPoll(struct rtw_adapter *padapter,
u8 *pframe, u32 *pLength) u8 *pframe, u32 *pLength)
{ {
struct ieee80211_hdr *pwlanhdr; struct ieee80211_hdr *pwlanhdr;
__le16 *fctrl;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
pwlanhdr = (struct ieee80211_hdr *)pframe; pwlanhdr = (struct ieee80211_hdr *)pframe;
/* Frame control. */ /* Frame control. */
fctrl = &pwlanhdr->frame_control; pwlanhdr->frame_control = cpu_to_le16(IEEE80211_FCTL_PM);
*(fctrl) = 0;
SetPwrMgt(fctrl);
SetFrameSubType(pframe, WIFI_PSPOLL); SetFrameSubType(pframe, WIFI_PSPOLL);
/* AID. */ /* AID. */
@ -355,7 +352,7 @@ ConstructNullFunctionData(struct rtw_adapter *padapter, u8 *pframe,
fctrl = &pwlanhdr->frame_control; fctrl = &pwlanhdr->frame_control;
if (bForcePowerSave) if (bForcePowerSave)
SetPwrMgt(fctrl); pwlanhdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);
switch (cur_network->network.ifmode) { switch (cur_network->network.ifmode) {
case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_P2P_CLIENT:

9
drivers/staging/rtl8723au/include/wifi.h
View File

@ -72,15 +72,6 @@ enum WIFI_FRAME_SUBTYPE {
#define SetFrDs(pbuf) \ #define SetFrDs(pbuf) \
(*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_FROMDS)) (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_FROMDS))
#define SetPwrMgt(pbuf) \
(*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PM))
#define SetMData(pbuf) \
(*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREDATA))
#define SetPrivacy(pbuf) \
(*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PROTECTED))
#define SetFrameType(pbuf, type) \ #define SetFrameType(pbuf, type) \
do { \ do { \
*(__le16 *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \ *(__le16 *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \