diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-05-21 09:38:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 16:27:48 +0900 |
| commit | b2f72caefea52659c3324ef4febfbd725dd6b60a (patch) | |
| tree | c817a2437b8b7f423bbc8233375b4de7993c033c /drivers | |
| parent | 0d280584c0c95b49859a6ffc2d9d2171e605716f (diff) | |
staging: rtl8723au: rtw_xmit.c: Use IEEE80211_[FS]TYPE_ defines
In addition pkt_attrib->type a u16 and get rid of pattrib->stype
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_xmit.c | 8 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/rtw_xmit.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/rtl8723au/core/rtw_xmit.c b/drivers/staging/rtl8723au/core/rtw_xmit.c index f99e59c7f9f..d92673bdcf8 100644 --- a/drivers/staging/rtl8723au/core/rtw_xmit.c +++ b/drivers/staging/rtl8723au/core/rtw_xmit.c @@ -422,7 +422,7 @@ static void set_qos(struct sk_buff *skb, struct pkt_attrib *pattrib) pattrib->priority = UserPriority; pattrib->hdrlen = sizeof(struct ieee80211_qos_hdr); - pattrib->subtype = WIFI_QOS_DATA_TYPE; + pattrib->type = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_DATA; } static int update_attrib(struct rtw_adapter *padapter, @@ -537,7 +537,7 @@ static int update_attrib(struct rtw_adapter *padapter, pattrib->pkt_hdrlen = ETH_HLEN; pattrib->hdrlen = sizeof(struct ieee80211_hdr_3addr); - pattrib->subtype = WIFI_DATA_TYPE; + pattrib->type = IEEE80211_FTYPE_DATA; pattrib->priority = 0; if (check_fwstate(pmlmepriv, WIFI_AP_STATE | WIFI_ADHOC_STATE | @@ -895,9 +895,9 @@ static int rtw_make_wlanhdr(struct rtw_adapter *padapter, u8 *hdr, memset(hdr, 0, WLANHDR_OFFSET); - SetFrameSubType(fctrl, pattrib->subtype); + pwlanhdr->frame_control = cpu_to_le16(pattrib->type); - if (pattrib->subtype & WIFI_DATA_TYPE) { + if (pattrib->type & IEEE80211_FTYPE_DATA) { if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true)) { /* to_ds = 1, fr_ds = 0; */ /* Data transfer to AP */ diff --git a/drivers/staging/rtl8723au/include/rtw_xmit.h b/drivers/staging/rtl8723au/include/rtw_xmit.h index 53030b6a376..32a84417032 100644 --- a/drivers/staging/rtl8723au/include/rtw_xmit.h +++ b/drivers/staging/rtl8723au/include/rtw_xmit.h @@ -114,8 +114,7 @@ struct hw_xmit { /* reduce size */ struct pkt_attrib { - u8 type; - u8 subtype; + u16 type; u8 bswenc; u8 dhcp_pkt; u16 ether_type; |