staging: rtl8723au: rtl8723a_cmd.c: Get rid of SetToDs()/SetFrDs() usage

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
index d4609c4bfc64e7bea1914379a7db76de9a056c84..e78f773af105cc1e9b8c9a629d3968189437ee3d 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c
@@ -337,7 +337,6 @@ ConstructNullFunctionData(struct rtw_adapter *padapter, u8 *pframe,
                          u8 bEosp, u8 bForcePowerSave)
 {
        struct ieee80211_hdr *pwlanhdr;
-       __le16 *fctrl;
        u32 pktlen;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct wlan_network *cur_network = &pmlmepriv->cur_network;
@@ -349,15 +348,13 @@ ConstructNullFunctionData(struct rtw_adapter *padapter, u8 *pframe,
        pwlanhdr->frame_control = 0;
        pwlanhdr->seq_ctrl = 0;
 
-       fctrl = &pwlanhdr->frame_control;
-
        if (bForcePowerSave)
                pwlanhdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);
 
        switch (cur_network->network.ifmode) {
        case NL80211_IFTYPE_P2P_CLIENT:
        case NL80211_IFTYPE_STATION:
-               SetToDs(fctrl);
+               pwlanhdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_TODS);
                memcpy(pwlanhdr->addr1,
                       get_my_bssid23a(&pmlmeinfo->network), ETH_ALEN);
                memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv),
@@ -366,7 +363,7 @@ ConstructNullFunctionData(struct rtw_adapter *padapter, u8 *pframe,
                break;
        case NL80211_IFTYPE_P2P_GO:
        case NL80211_IFTYPE_AP:
-               SetFrDs(fctrl);
+               pwlanhdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_FROMDS);
                memcpy(pwlanhdr->addr1, StaAddr, ETH_ALEN);
                memcpy(pwlanhdr->addr2,
                       get_my_bssid23a(&pmlmeinfo->network), ETH_ALEN);