diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-05-21 09:38:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 16:27:49 +0900 |
| commit | cade4108a8380bd47cbb0ee9ffdcd3a25edb56b7 (patch) | |
| tree | a211293ab5d67e11ea173a6e01454d8e45adb800 | |
| parent | c26e95737be5e07c68f7b2828fa3c5d5ff2387e0 (diff) | |
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>
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c b/drivers/staging/rtl8723au/hal/rtl8723a_cmd.c index d4609c4bfc6..e78f773af10 100644 --- 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); |