mirror of
https://github.com/Mange/rtl8192eu-linux-driver
synced 2025-12-10 00:04:17 +00:00
switch to common ieee80211 headers
This patch switches to <linux/ieee80211.h> and <net/cfg80211.h> and deletes a lot of duplicate definitions plus many unused ones. rtw_ieee80211_hdr_3addr_qos is duplicate of ieee80211_qos_hdr. rtw_ieee80211_spectrum_mgmt_actioncode is a duplication of ieee80211_spectrum_mgmt_actioncode rtw_ieee80211_hdr_3addr is duplicate of ieee80211_hdr_3addr. rtw_ieee80211_hdr is duplicate of ieee80211_hdr rtw_ieee80211s_hdr is duplicate of ieee80211s_hdr rtw_ieee80211_rann_ie is duplicate of ieee80211_rann_ie from include/linux/ieee80211.h. Link: https://lore.kernel.org/r/20200906133236.556427-1-insafonov@gmail.com Link: https://lore.kernel.org/r/20200609194848.166130-1-pterjan@google.com Also port 5cd8396540b5f7ef7c3ac499e967dd4deb8e9930 bbfe286b07d8282f4957dee692e85b3bd60de770 d87f574d6923c546e7d0f75ce0581436376b98a6 36eb7d108e8de3097f373eb8629d8739d4fa3e74 1b9e6df5169b36b3242e2e28c39f9bbfc01863e8 d94971aa97670d400371baef5d9d5cf6dc8ea2b5
This commit is contained in:
@@ -176,7 +176,7 @@ static u8 _send_ht_ndpa_packet(PADAPTER adapter, u8 *ra, enum channel_width bw)
|
||||
u8 ActionHdr[4] = {ACT_CAT_VENDOR, 0x00, 0xE0, 0x4C};
|
||||
/* MISC */
|
||||
struct pkt_attrib *attrib;
|
||||
struct rtw_ieee80211_hdr *pwlanhdr;
|
||||
struct ieee80211_hdr *pwlanhdr;
|
||||
enum MGN_RATE txrate;
|
||||
u8 *pframe;
|
||||
u16 duration = 0;
|
||||
@@ -215,10 +215,10 @@ static u8 _send_ht_ndpa_packet(PADAPTER adapter, u8 *ra, enum channel_width bw)
|
||||
|
||||
memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET);
|
||||
pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
pwlanhdr = (struct ieee80211_hdr *)pframe;
|
||||
|
||||
/* Frame control */
|
||||
pwlanhdr->frame_ctl = 0;
|
||||
pwlanhdr->frame_control = 0;
|
||||
set_frame_sub_type(pframe, attrib->subtype);
|
||||
set_order_bit(pframe);
|
||||
|
||||
@@ -272,7 +272,7 @@ static u8 _send_vht_ndpa_packet(PADAPTER adapter, u8 *ra, u16 aid, enum channel_
|
||||
struct ndpa_sta_info sta_info;
|
||||
/* MISC */
|
||||
struct pkt_attrib *attrib;
|
||||
struct rtw_ieee80211_hdr *pwlanhdr;
|
||||
struct ieee80211_hdr *pwlanhdr;
|
||||
u8 *pframe;
|
||||
enum MGN_RATE txrate;
|
||||
u16 duration = 0;
|
||||
@@ -310,10 +310,10 @@ static u8 _send_vht_ndpa_packet(PADAPTER adapter, u8 *ra, u16 aid, enum channel_
|
||||
|
||||
memset(pmgntframe->buf_addr, 0, TXDESC_OFFSET + WLANHDR_OFFSET);
|
||||
pframe = pmgntframe->buf_addr + TXDESC_OFFSET;
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
pwlanhdr = (struct ieee80211_hdr *)pframe;
|
||||
|
||||
/* Frame control */
|
||||
pwlanhdr->frame_ctl = 0;
|
||||
pwlanhdr->frame_control = 0;
|
||||
set_frame_sub_type(pframe, attrib->subtype);
|
||||
|
||||
/* Duration */
|
||||
@@ -379,7 +379,7 @@ static u8 _send_vht_mu_ndpa_packet(PADAPTER adapter, enum channel_width bw)
|
||||
struct ndpa_sta_info sta_info;
|
||||
/* MISC */
|
||||
struct pkt_attrib *attrib;
|
||||
struct rtw_ieee80211_hdr *pwlanhdr;
|
||||
struct ieee80211_hdr *pwlanhdr;
|
||||
enum MGN_RATE txrate;
|
||||
u8 *pframe;
|
||||
u8 *ra = NULL;
|
||||
@@ -427,10 +427,10 @@ static u8 _send_vht_mu_ndpa_packet(PADAPTER adapter, enum channel_width bw)
|
||||
|
||||
memset(pmgntframe->buf_addr, 0, TXDESC_OFFSET + WLANHDR_OFFSET);
|
||||
pframe = pmgntframe->buf_addr + TXDESC_OFFSET;
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
pwlanhdr = (struct ieee80211_hdr *)pframe;
|
||||
|
||||
/* Frame control */
|
||||
pwlanhdr->frame_ctl = 0;
|
||||
pwlanhdr->frame_control = 0;
|
||||
set_frame_sub_type(pframe, attrib->subtype);
|
||||
|
||||
/* Duration */
|
||||
@@ -490,7 +490,7 @@ static u8 _send_bf_report_poll(PADAPTER adapter, u8 *ra, u8 bFinalPoll)
|
||||
struct xmit_frame *pmgntframe;
|
||||
/* MISC */
|
||||
struct pkt_attrib *attrib;
|
||||
struct rtw_ieee80211_hdr *pwlanhdr;
|
||||
struct ieee80211_hdr *pwlanhdr;
|
||||
u8 *pframe;
|
||||
|
||||
|
||||
@@ -519,10 +519,10 @@ static u8 _send_bf_report_poll(PADAPTER adapter, u8 *ra, u8 bFinalPoll)
|
||||
|
||||
memset(pmgntframe->buf_addr, 0, TXDESC_OFFSET + WLANHDR_OFFSET);
|
||||
pframe = pmgntframe->buf_addr + TXDESC_OFFSET;
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
pwlanhdr = (struct ieee80211_hdr *)pframe;
|
||||
|
||||
/* Frame control */
|
||||
pwlanhdr->frame_ctl = 0;
|
||||
pwlanhdr->frame_control = 0;
|
||||
set_frame_sub_type(pframe, attrib->subtype);
|
||||
|
||||
/* Duration */
|
||||
@@ -1627,7 +1627,7 @@ u32 rtw_bf_get_report_packet(PADAPTER adapter, union recv_frame *precv_frame)
|
||||
if (!bfee)
|
||||
return _FAIL;
|
||||
|
||||
frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
frame_body = pframe + sizeof(struct ieee80211_hdr_3addr);
|
||||
category = frame_body[0];
|
||||
action = frame_body[1];
|
||||
|
||||
@@ -1693,7 +1693,7 @@ u8 rtw_bf_send_vht_gid_mgnt_packet(PADAPTER adapter, u8 *ra, u8 *gid, u8 *positi
|
||||
struct xmit_frame *pmgntframe;
|
||||
/* MISC */
|
||||
struct pkt_attrib *attrib;
|
||||
struct rtw_ieee80211_hdr *wlanhdr;
|
||||
struct ieee80211_hdr *wlanhdr;
|
||||
u8 *pframe, *ptr;
|
||||
|
||||
|
||||
@@ -1714,9 +1714,9 @@ u8 rtw_bf_send_vht_gid_mgnt_packet(PADAPTER adapter, u8 *ra, u8 *gid, u8 *positi
|
||||
memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET);
|
||||
|
||||
pframe = (u8 *)pmgntframe->buf_addr + TXDESC_OFFSET;
|
||||
wlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
wlanhdr = (struct ieee80211_hdr *)pframe;
|
||||
|
||||
wlanhdr->frame_ctl = 0;
|
||||
wlanhdr->frame_control = 0;
|
||||
set_frame_sub_type(pframe, attrib->subtype);
|
||||
set_duration(pframe, 0);
|
||||
SetFragNum(pframe, 0);
|
||||
@@ -2176,7 +2176,7 @@ BOOLEAN issue_ht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, enum channel_width bw,
|
||||
{
|
||||
struct xmit_frame *pmgntframe;
|
||||
struct pkt_attrib *pattrib;
|
||||
struct rtw_ieee80211_hdr *pwlanhdr;
|
||||
struct ieee80211_hdr *pwlanhdr;
|
||||
struct xmit_priv *pxmitpriv = &(Adapter->xmitpriv);
|
||||
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
@@ -2209,9 +2209,9 @@ BOOLEAN issue_ht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, enum channel_width bw,
|
||||
|
||||
pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
|
||||
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
pwlanhdr = (struct ieee80211_hdr *)pframe;
|
||||
|
||||
fctrl = &pwlanhdr->frame_ctl;
|
||||
fctrl =&pwlanhdr->frame_control;
|
||||
*(fctrl) = 0;
|
||||
|
||||
set_order_bit(pframe);
|
||||
@@ -2255,7 +2255,7 @@ BOOLEAN issue_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, enum channel_width bw, u8
|
||||
{
|
||||
struct xmit_frame *pmgntframe;
|
||||
struct pkt_attrib *pattrib;
|
||||
struct rtw_ieee80211_hdr *pwlanhdr;
|
||||
struct ieee80211_hdr *pwlanhdr;
|
||||
struct xmit_priv *pxmitpriv = &(Adapter->xmitpriv);
|
||||
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
@@ -2285,9 +2285,9 @@ BOOLEAN issue_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, enum channel_width bw, u8
|
||||
|
||||
pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
|
||||
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
pwlanhdr = (struct ieee80211_hdr *)pframe;
|
||||
|
||||
fctrl = &pwlanhdr->frame_ctl;
|
||||
fctrl =&pwlanhdr->frame_control;
|
||||
*(fctrl) = 0;
|
||||
|
||||
set_order_bit(pframe);
|
||||
@@ -2334,7 +2334,7 @@ BOOLEAN issue_vht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, enum channel
|
||||
{
|
||||
struct xmit_frame *pmgntframe;
|
||||
struct pkt_attrib *pattrib;
|
||||
struct rtw_ieee80211_hdr *pwlanhdr;
|
||||
struct ieee80211_hdr *pwlanhdr;
|
||||
struct xmit_priv *pxmitpriv = &(Adapter->xmitpriv);
|
||||
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
@@ -2372,9 +2372,9 @@ BOOLEAN issue_vht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, enum channel
|
||||
|
||||
pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
|
||||
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
pwlanhdr = (struct ieee80211_hdr *)pframe;
|
||||
|
||||
fctrl = &pwlanhdr->frame_ctl;
|
||||
fctrl =&pwlanhdr->frame_control;
|
||||
*(fctrl) = 0;
|
||||
|
||||
set_frame_sub_type(pframe, WIFI_NDPA);
|
||||
@@ -2428,7 +2428,7 @@ BOOLEAN issue_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, enum channel_wi
|
||||
{
|
||||
struct xmit_frame *pmgntframe;
|
||||
struct pkt_attrib *pattrib;
|
||||
struct rtw_ieee80211_hdr *pwlanhdr;
|
||||
struct ieee80211_hdr *pwlanhdr;
|
||||
struct xmit_priv *pxmitpriv = &(Adapter->xmitpriv);
|
||||
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
@@ -2458,9 +2458,9 @@ BOOLEAN issue_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, enum channel_wi
|
||||
|
||||
pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET;
|
||||
|
||||
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
|
||||
pwlanhdr = (struct ieee80211_hdr *)pframe;
|
||||
|
||||
fctrl = &pwlanhdr->frame_ctl;
|
||||
fctrl =&pwlanhdr->frame_control;
|
||||
*(fctrl) = 0;
|
||||
|
||||
set_frame_sub_type(pframe, WIFI_NDPA);
|
||||
|
||||
Reference in New Issue
Block a user