mirror of
https://github.com/Mange/rtl8192eu-linux-driver
synced 2025-12-11 08:43:46 +00:00
remove enum WIFI_FRAME_SUBTYPE
The values defined in enum WIFI_FRAME_SUBTYPE are the same the #define IEEE80211_STYPE_xxx from <linux/ieee80211.h>. Port 33ed2b7079f6c38abce6abbaf1e6be4edad919d8
This commit is contained in:
@@ -22,47 +22,47 @@
|
||||
|
||||
|
||||
struct mlme_handler mlme_sta_tbl[] = {
|
||||
{WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq},
|
||||
{WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp},
|
||||
{WIFI_REASSOCREQ, "OnReAssocReq", &OnAssocReq},
|
||||
{WIFI_REASSOCRSP, "OnReAssocRsp", &OnAssocRsp},
|
||||
{WIFI_PROBEREQ, "OnProbeReq", &OnProbeReq},
|
||||
{WIFI_PROBERSP, "OnProbeRsp", &OnProbeRsp},
|
||||
{IEEE80211_STYPE_ASSOC_REQ, "OnAssocReq", &OnAssocReq},
|
||||
{IEEE80211_STYPE_ASSOC_RESP, "OnAssocRsp", &OnAssocRsp},
|
||||
{IEEE80211_STYPE_REASSOC_REQ, "OnReAssocReq", &OnAssocReq},
|
||||
{IEEE80211_STYPE_REASSOC_RESP, "OnReAssocRsp", &OnAssocRsp},
|
||||
{IEEE80211_STYPE_PROBE_REQ, "OnProbeReq", &OnProbeReq},
|
||||
{IEEE80211_STYPE_PROBE_RESP, "OnProbeRsp", &OnProbeRsp},
|
||||
|
||||
/*----------------------------------------------------------
|
||||
below 2 are reserved
|
||||
-----------------------------------------------------------*/
|
||||
{0, "DoReserved", &DoReserved},
|
||||
{0, "DoReserved", &DoReserved},
|
||||
{WIFI_BEACON, "OnBeacon", &OnBeacon},
|
||||
{WIFI_ATIM, "OnATIM", &OnAtim},
|
||||
{WIFI_DISASSOC, "OnDisassoc", &OnDisassoc},
|
||||
{WIFI_AUTH, "OnAuth", &OnAuthClient},
|
||||
{WIFI_DEAUTH, "OnDeAuth", &OnDeAuth},
|
||||
{WIFI_ACTION, "OnAction", &OnAction},
|
||||
{IEEE80211_STYPE_BEACON, "OnBeacon", &OnBeacon},
|
||||
{IEEE80211_STYPE_ATIM, "OnATIM", &OnAtim},
|
||||
{IEEE80211_STYPE_DISASSOC, "OnDisassoc", &OnDisassoc},
|
||||
{IEEE80211_STYPE_AUTH, "OnAuth", &OnAuthClient},
|
||||
{IEEE80211_STYPE_DEAUTH, "OnDeAuth", &OnDeAuth},
|
||||
{IEEE80211_STYPE_ACTION, "OnAction", &OnAction},
|
||||
{WIFI_ACTION_NOACK, "OnActionNoAck", &OnAction},
|
||||
};
|
||||
|
||||
#ifdef _CONFIG_NATIVEAP_MLME_
|
||||
struct mlme_handler mlme_ap_tbl[] = {
|
||||
{WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq},
|
||||
{WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp},
|
||||
{WIFI_REASSOCREQ, "OnReAssocReq", &OnAssocReq},
|
||||
{WIFI_REASSOCRSP, "OnReAssocRsp", &OnAssocRsp},
|
||||
{WIFI_PROBEREQ, "OnProbeReq", &OnProbeReq},
|
||||
{WIFI_PROBERSP, "OnProbeRsp", &OnProbeRsp},
|
||||
{IEEE80211_STYPE_ASSOC_REQ, "OnAssocReq", &OnAssocReq},
|
||||
{IEEE80211_STYPE_ASSOC_RESP, "OnAssocRsp", &OnAssocRsp},
|
||||
{IEEE80211_STYPE_REASSOC_REQ, "OnReAssocReq", &OnAssocReq},
|
||||
{IEEE80211_STYPE_REASSOC_RESP, "OnReAssocRsp", &OnAssocRsp},
|
||||
{IEEE80211_STYPE_PROBE_REQ, "OnProbeReq", &OnProbeReq},
|
||||
{IEEE80211_STYPE_PROBE_RESP, "OnProbeRsp", &OnProbeRsp},
|
||||
|
||||
/*----------------------------------------------------------
|
||||
below 2 are reserved
|
||||
-----------------------------------------------------------*/
|
||||
{0, "DoReserved", &DoReserved},
|
||||
{0, "DoReserved", &DoReserved},
|
||||
{WIFI_BEACON, "OnBeacon", &OnBeacon},
|
||||
{WIFI_ATIM, "OnATIM", &OnAtim},
|
||||
{WIFI_DISASSOC, "OnDisassoc", &OnDisassoc},
|
||||
{WIFI_AUTH, "OnAuth", &OnAuth},
|
||||
{WIFI_DEAUTH, "OnDeAuth", &OnDeAuth},
|
||||
{WIFI_ACTION, "OnAction", &OnAction},
|
||||
{IEEE80211_STYPE_BEACON, "OnBeacon", &OnBeacon},
|
||||
{IEEE80211_STYPE_ATIM, "OnATIM", &OnAtim},
|
||||
{IEEE80211_STYPE_DISASSOC, "OnDisassoc", &OnDisassoc},
|
||||
{IEEE80211_STYPE_AUTH, "OnAuth", &OnAuth},
|
||||
{IEEE80211_STYPE_DEAUTH, "OnDeAuth", &OnDeAuth},
|
||||
{IEEE80211_STYPE_ACTION, "OnAction", &OnAction},
|
||||
{WIFI_ACTION_NOACK, "OnActionNoAck", &OnAction},
|
||||
};
|
||||
#endif
|
||||
@@ -1271,7 +1271,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
|
||||
}
|
||||
#endif
|
||||
|
||||
if (GetFrameType(pframe) != WIFI_MGT_TYPE) {
|
||||
if (GetFrameType(pframe) != IEEE80211_FTYPE_MGMT) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1303,7 +1303,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
|
||||
index = get_frame_sub_type(pframe) >> 4;
|
||||
|
||||
#ifdef CONFIG_TDLS
|
||||
if ((index << 4) == WIFI_ACTION) {
|
||||
if ((index << 4) == IEEE80211_STYPE_ACTION) {
|
||||
/* category==public (4), action==TDLS_DISCOVERY_RESPONSE */
|
||||
if (*(pframe + 24) == RTW_WLAN_CATEGORY_PUBLIC && *(pframe + 25) == TDLS_DISCOVERY_RESPONSE) {
|
||||
RTW_INFO("[TDLS] Recv %s from "MAC_FMT"\n", rtw_tdls_action_txt(TDLS_DISCOVERY_RESPONSE), MAC_ARG(get_addr2_ptr(pframe)));
|
||||
@@ -1338,7 +1338,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
|
||||
|
||||
#ifdef CONFIG_AP_MODE
|
||||
switch (get_frame_sub_type(pframe)) {
|
||||
case WIFI_AUTH:
|
||||
case IEEE80211_STYPE_AUTH:
|
||||
if (MLME_IS_AP(padapter) || MLME_IS_MESH(padapter))
|
||||
ptable->func = &OnAuth;
|
||||
else
|
||||
@@ -1348,25 +1348,25 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
|
||||
#else
|
||||
__attribute__ ((__fallthrough__));
|
||||
#endif
|
||||
case WIFI_ASSOCREQ:
|
||||
case WIFI_REASSOCREQ:
|
||||
case IEEE80211_STYPE_ASSOC_REQ:
|
||||
case IEEE80211_STYPE_REASSOC_REQ:
|
||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
||||
#ifdef CONFIG_HOSTAPD_MLME
|
||||
if (MLME_IS_AP(padapter))
|
||||
rtw_hostapd_mlme_rx(padapter, precv_frame);
|
||||
#endif
|
||||
break;
|
||||
case WIFI_PROBEREQ:
|
||||
case IEEE80211_STYPE_PROBE_REQ:
|
||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
||||
#ifdef CONFIG_HOSTAPD_MLME
|
||||
if (MLME_IS_AP(padapter))
|
||||
rtw_hostapd_mlme_rx(padapter, precv_frame);
|
||||
#endif
|
||||
break;
|
||||
case WIFI_BEACON:
|
||||
case IEEE80211_STYPE_BEACON:
|
||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
||||
break;
|
||||
case WIFI_ACTION:
|
||||
case IEEE80211_STYPE_ACTION:
|
||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
||||
break;
|
||||
default:
|
||||
@@ -2438,10 +2438,10 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
|
||||
return _FAIL;
|
||||
|
||||
frame_type = get_frame_sub_type(pframe);
|
||||
if (frame_type == WIFI_ASSOCREQ) {
|
||||
if (frame_type == IEEE80211_STYPE_ASSOC_REQ) {
|
||||
reassoc = 0;
|
||||
ie_offset = _ASOCREQ_IE_OFFSET_;
|
||||
} else { /* WIFI_REASSOCREQ */
|
||||
} else { /* IEEE80211_STYPE_REASSOC_REQ */
|
||||
reassoc = 1;
|
||||
ie_offset = _REASOCREQ_IE_OFFSET_;
|
||||
}
|
||||
@@ -2665,10 +2665,10 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
|
||||
status = _STATS_REFUSED_TEMPORARILY_;
|
||||
#endif /* CONFIG_IEEE80211W */
|
||||
/* .2 issue assoc rsp before notify station join event. */
|
||||
if (frame_type == WIFI_ASSOCREQ)
|
||||
issue_asocrsp(padapter, status, pstat, WIFI_ASSOCRSP);
|
||||
if (frame_type == IEEE80211_STYPE_ASSOC_REQ)
|
||||
issue_asocrsp(padapter, status, pstat, IEEE80211_STYPE_ASSOC_RESP);
|
||||
else
|
||||
issue_asocrsp(padapter, status, pstat, WIFI_REASSOCRSP);
|
||||
issue_asocrsp(padapter, status, pstat, IEEE80211_STYPE_REASSOC_RESP);
|
||||
|
||||
#ifdef CONFIG_IOCTL_CFG80211
|
||||
_enter_critical_bh(&pstat->lock, &irqL);
|
||||
@@ -2716,10 +2716,10 @@ OnAssocReqFail:
|
||||
|
||||
#ifdef CONFIG_NATIVEAP_MLME
|
||||
pstat->cmn.aid = 0;
|
||||
if (frame_type == WIFI_ASSOCREQ)
|
||||
issue_asocrsp(padapter, status, pstat, WIFI_ASSOCRSP);
|
||||
if (frame_type == IEEE80211_STYPE_ASSOC_REQ)
|
||||
issue_asocrsp(padapter, status, pstat, IEEE80211_STYPE_ASSOC_RESP);
|
||||
else
|
||||
issue_asocrsp(padapter, status, pstat, WIFI_REASSOCRSP);
|
||||
issue_asocrsp(padapter, status, pstat, IEEE80211_STYPE_REASSOC_RESP);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -3779,7 +3779,7 @@ void issue_p2p_GO_request(_adapter *padapter, u8 *raddr)
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -4178,7 +4178,7 @@ void issue_p2p_GO_response(_adapter *padapter, u8 *raddr, u8 *frame_body, uint l
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -4590,7 +4590,7 @@ void issue_p2p_GO_confirm(_adapter *padapter, u8 *raddr, u8 result)
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -4826,7 +4826,7 @@ void issue_p2p_invitation_request(_adapter *padapter, u8 *raddr)
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -5123,7 +5123,7 @@ void issue_p2p_invitation_response(_adapter *padapter, u8 *raddr, u8 dialogToken
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -5359,7 +5359,7 @@ void issue_p2p_provision_request(_adapter *padapter, u8 *pssid, u8 ussidlen, u8
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -5500,7 +5500,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da)
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(fctrl, WIFI_PROBERSP);
|
||||
set_frame_sub_type(fctrl, IEEE80211_STYPE_PROBE_RESP);
|
||||
|
||||
pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = pattrib->hdrlen;
|
||||
@@ -5839,7 +5839,7 @@ int _issue_probereq_p2p(_adapter *padapter, u8 *da, int wait_ack)
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_PROBEREQ);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_PROBE_REQ);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -7160,7 +7160,7 @@ void rtw_wnm_issue_action(_adapter *padapter, u8 action, u8 reason)
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -7844,7 +7844,7 @@ void issue_beacon(_adapter *padapter, int timeout_ms)
|
||||
|
||||
SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/);
|
||||
/* pmlmeext->mgnt_seq++; */
|
||||
set_frame_sub_type(pframe, WIFI_BEACON);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_BEACON);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -8155,7 +8155,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(fctrl, WIFI_PROBERSP);
|
||||
set_frame_sub_type(fctrl, IEEE80211_STYPE_PROBE_RESP);
|
||||
|
||||
pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = pattrib->hdrlen;
|
||||
@@ -8456,7 +8456,7 @@ int _issue_probereq(_adapter *padapter, const NDIS_802_11_SSID *pssid, const u8
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
}
|
||||
set_frame_sub_type(pframe, WIFI_PROBEREQ);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_PROBE_REQ);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -8608,7 +8608,7 @@ void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_AUTH);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_AUTH);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -8778,7 +8778,7 @@ void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *p
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
if ((pkt_type == WIFI_ASSOCRSP) || (pkt_type == WIFI_REASSOCRSP))
|
||||
if ((pkt_type == IEEE80211_STYPE_ASSOC_RESP) || (pkt_type == IEEE80211_STYPE_REASSOC_RESP))
|
||||
set_frame_sub_type(pwlanhdr, pkt_type);
|
||||
else
|
||||
return;
|
||||
@@ -9014,9 +9014,9 @@ void _issue_assocreq(_adapter *padapter, u8 is_reassoc)
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
if (is_reassoc == _TRUE)
|
||||
set_frame_sub_type(pframe, WIFI_REASSOCREQ);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_REASSOC_REQ);
|
||||
else
|
||||
set_frame_sub_type(pframe, WIFI_ASSOCREQ);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ASSOC_REQ);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -9508,7 +9508,7 @@ static int _issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int p
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_DATA_NULL);
|
||||
set_frame_sub_type(pframe, IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr) + a4_shift;
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr) + a4_shift;
|
||||
@@ -9662,7 +9662,7 @@ static int _issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, u
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_QOS_DATA_NULL);
|
||||
set_frame_sub_type(pframe, IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr_qos) + a4_shift;
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr_qos) + a4_shift;
|
||||
@@ -9786,7 +9786,7 @@ static int _issue_deauth(_adapter *padapter, unsigned char *da, unsigned short r
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_DEAUTH);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_DEAUTH);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -9909,7 +9909,7 @@ void issue_action_spct_ch_switch(_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_of
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -9984,7 +9984,7 @@ void issue_action_SA_Query(_adapter *padapter, unsigned char *raddr, unsigned ch
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -10085,7 +10085,7 @@ static int issue_action_ba(_adapter *padapter, unsigned char *raddr, unsigned ch
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -10422,7 +10422,7 @@ void issue_action_BSSCoexistPacket(_adapter *padapter)
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -10572,7 +10572,7 @@ int _issue_action_SM_PS(_adapter *padapter , unsigned char *raddr , u8 NewMimoP
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
@@ -10931,15 +10931,15 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
|
||||
|
||||
subtype = get_frame_sub_type(pframe);
|
||||
|
||||
if (subtype == WIFI_BEACON) {
|
||||
if (subtype == IEEE80211_STYPE_BEACON) {
|
||||
bssid->Reserved[0] = BSS_TYPE_BCN;
|
||||
ie_offset = _BEACON_IE_OFFSET_;
|
||||
} else {
|
||||
/* FIXME : more type */
|
||||
if (subtype == WIFI_PROBERSP) {
|
||||
if (subtype == IEEE80211_STYPE_PROBE_RESP) {
|
||||
ie_offset = _PROBERSP_IE_OFFSET_;
|
||||
bssid->Reserved[0] = BSS_TYPE_PROB_RSP;
|
||||
} else if (subtype == WIFI_PROBEREQ) {
|
||||
} else if (subtype == IEEE80211_STYPE_PROBE_REQ) {
|
||||
ie_offset = _PROBEREQ_IE_OFFSET_;
|
||||
bssid->Reserved[0] = BSS_TYPE_PROB_REQ;
|
||||
} else {
|
||||
@@ -11034,7 +11034,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
|
||||
}
|
||||
|
||||
#ifdef CONFIG_P2P
|
||||
if (subtype == WIFI_PROBEREQ) {
|
||||
if (subtype == IEEE80211_STYPE_PROBE_REQ) {
|
||||
u8 *p2p_ie;
|
||||
u32 p2p_ielen;
|
||||
/* Set Listion Channel */
|
||||
@@ -13505,7 +13505,7 @@ void rtw_ft_issue_action_req(_adapter *padapter, u8 *pTargetAddr)
|
||||
|
||||
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
|
||||
pmlmeext->mgnt_seq++;
|
||||
set_frame_sub_type(pframe, WIFI_ACTION);
|
||||
set_frame_sub_type(pframe, IEEE80211_STYPE_ACTION);
|
||||
|
||||
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
||||
|
||||
Reference in New Issue
Block a user