From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Wed, 21 May 2014 07:38:17 +0000 (+0200)
Subject: staging: rtl8723au: rtw_xmit.c: Get rid of SetToDs()/SetFrDs() usage
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c26e95737be5e07c68f7b2828fa3c5d5ff2387e0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

staging: rtl8723au: rtw_xmit.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/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c
index d92673bdcf89..3869386f441a 100644
--- a/drivers/staging/rtl8723au/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723au/core/rtw_xmit.c
@@ -866,7 +866,6 @@ static int rtw_make_wlanhdr(struct rtw_adapter *padapter, u8 *hdr,
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 	u8 qos_option = false;
 	int res = _SUCCESS;
-	__le16 *fctrl = &pwlanhdr->frame_control;
 
 	struct sta_info *psta;
 
@@ -901,7 +900,8 @@ static int rtw_make_wlanhdr(struct rtw_adapter *padapter, u8 *hdr,
 		if ((check_fwstate(pmlmepriv,  WIFI_STATION_STATE) == true)) {
 			/* to_ds = 1, fr_ds = 0; */
 			/* Data transfer to AP */
-			SetToDs(fctrl);
+			pwlanhdr->frame_control |=
+				cpu_to_le16(IEEE80211_FCTL_TODS);
 			memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
 			memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
 			memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
@@ -912,7 +912,8 @@ static int rtw_make_wlanhdr(struct rtw_adapter *padapter, u8 *hdr,
 		}
 		else if ((check_fwstate(pmlmepriv,  WIFI_AP_STATE) == true)) {
 			/* to_ds = 0, fr_ds = 1; */
-			SetFrDs(fctrl);
+			pwlanhdr->frame_control |=
+				cpu_to_le16(IEEE80211_FCTL_FROMDS);
 			memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
 			memcpy(pwlanhdr->addr2, get_bssid(pmlmepriv), ETH_ALEN);
 			memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN);