Github/rtl8192eu-linux-driver
1
0
Fork 0
mirror of https://github.com/Mange/rtl8192eu-linux-driver synced 2024-11-25 15:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

include/ieee80211.h cleaup.

Browse Source 
Remove empty functions from ieee80211.h
Use values from linux/ieee80211.h

port 12a17d72f7948148b80c0dfa72ea983da33464ba
port a9d8763889737b7e0f83956e093bd48190876044
port 872cfb096d3a009709b56f23f5280a359bbe58e2
port a4bc0fa9ec51008bb494943ec98b4ad836e3a216
port 13e00f8ebded278a7887d98ad65ceabc24f3776a
This commit is contained in:
Carlos Garces 2021-10-20 21:54:12 +02:00
parent 5a65660af3
commit 6b480dfa8e
17 changed files with 224 additions and 672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/mesh/rtw_mesh.c
View File

@ -1772,7 +1772,7 @@ static int rtw_mesh_check_frames(_adapter *adapter, const u8 **buf, size_t *len,
frame_body = *buf + sizeof(struct rtw_ieee80211_hdr_3addr); frame_body = *buf + sizeof(struct rtw_ieee80211_hdr_3addr);
category = frame_body[0]; category = frame_body[0];
if (category == RTW_WLAN_CATEGORY_SELF_PROTECTED) { if (category == WLAN_CATEGORY_SELF_PROTECTED) {
action = frame_body[1]; action = frame_body[1];
switch (action) { switch (action) {
case RTW_ACT_SELF_PROTECTED_MESH_OPEN: case RTW_ACT_SELF_PROTECTED_MESH_OPEN:
@ -1845,7 +1845,7 @@ unsigned int on_action_self_protected(_adapter *adapter, union recv_frame *rfram
goto exit; goto exit;
category = frame_body[0]; category = frame_body[0];
if (category != RTW_WLAN_CATEGORY_SELF_PROTECTED) if (category != WLAN_CATEGORY_SELF_PROTECTED)
goto exit; goto exit;
action = frame_body[1]; action = frame_body[1];
@ -1904,7 +1904,7 @@ unsigned int on_action_mesh(_adapter *adapter, union recv_frame *rframe)
/* check stainfo exist? */ /* check stainfo exist? */
category = frame_body[0]; category = frame_body[0];
if (category != RTW_WLAN_CATEGORY_MESH) if (category != WLAN_CATEGORY_MESH_ACTION)
goto exit; goto exit;
action = frame_body[1]; action = frame_body[1];
@ -2531,7 +2531,7 @@ static u8 *rtw_mesh_construct_peer_mesh_close(_adapter *adapter, struct mesh_pli
set_frame_sub_type(frame, IEEE80211_STYPE_ACTION); set_frame_sub_type(frame, IEEE80211_STYPE_ACTION);
pos += sizeof(struct rtw_ieee80211_hdr_3addr); pos += sizeof(struct rtw_ieee80211_hdr_3addr);
*(pos++) = RTW_WLAN_CATEGORY_SELF_PROTECTED; *(pos++) = WLAN_CATEGORY_SELF_PROTECTED;
*(pos++) = RTW_ACT_SELF_PROTECTED_MESH_CLOSE; *(pos++) = RTW_ACT_SELF_PROTECTED_MESH_CLOSE;
pos = rtw_set_ie_mesh_id(pos, NULL, minfo->mesh_id, minfo->mesh_id_len); pos = rtw_set_ie_mesh_id(pos, NULL, minfo->mesh_id, minfo->mesh_id_len);

36
core/mesh/rtw_mesh_hwmp.c
View File

@ -218,7 +218,7 @@ static int rtw_mesh_path_sel_frame_tx(enum rtw_mpath_frame_type mpath_action, u8
struct xmit_frame *pmgntframe = NULL; struct xmit_frame *pmgntframe = NULL;
struct rtw_ieee80211_hdr *pwlanhdr = NULL; struct rtw_ieee80211_hdr *pwlanhdr = NULL;
struct pkt_attrib *pattrib = NULL; struct pkt_attrib *pattrib = NULL;
u8 category = RTW_WLAN_CATEGORY_MESH; u8 category = WLAN_CATEGORY_MESH_ACTION;
u8 action = RTW_ACT_MESH_HWMP_PATH_SELECTION; u8 action = RTW_ACT_MESH_HWMP_PATH_SELECTION;
u16 *fctrl = NULL; u16 *fctrl = NULL;
u8 *pos, ie_len; u8 *pos, ie_len;
@ -330,7 +330,7 @@ int rtw_mesh_path_error_tx(_adapter *adapter,
struct rtw_ieee80211_hdr *pwlanhdr = NULL; struct rtw_ieee80211_hdr *pwlanhdr = NULL;
struct pkt_attrib *pattrib = NULL; struct pkt_attrib *pattrib = NULL;
struct rtw_mesh_info *minfo = &adapter->mesh_info; struct rtw_mesh_info *minfo = &adapter->mesh_info;
u8 category = RTW_WLAN_CATEGORY_MESH; u8 category = WLAN_CATEGORY_MESH_ACTION;
u8 action = RTW_ACT_MESH_HWMP_PATH_SELECTION; u8 action = RTW_ACT_MESH_HWMP_PATH_SELECTION;
u8 *pos, ie_len; u8 *pos, ie_len;
u16 *fctrl = NULL; u16 *fctrl = NULL;
@ -644,7 +644,7 @@ static void rtw_hwmp_preq_frame_process(_adapter *adapter,
target_flags = RTW_PREQ_IE_TARGET_F(preq_elem); target_flags = RTW_PREQ_IE_TARGET_F(preq_elem);
/* PREQ gate announcements */ /* PREQ gate announcements */
flags = RTW_PREQ_IE_FLAGS(preq_elem); flags = RTW_PREQ_IE_FLAGS(preq_elem);
preq_is_gate = !!(flags & RTW_IEEE80211_PREQ_IS_GATE_FLAG); preq_is_gate = !!(flags & IEEE80211_PREQ_IS_GATE_FLAG);
RTW_HWMP_DBG("received PREQ from "MAC_FMT"\n", MAC_ARG(originator_addr)); RTW_HWMP_DBG("received PREQ from "MAC_FMT"\n", MAC_ARG(originator_addr));
@ -677,11 +677,11 @@ static void rtw_hwmp_preq_frame_process(_adapter *adapter,
} }
target_sn = minfo->sn; target_sn = minfo->sn;
} else if (is_broadcast_mac_addr(target_addr) && } else if (is_broadcast_mac_addr(target_addr) &&
(target_flags & RTW_IEEE80211_PREQ_TO_FLAG)) { (target_flags & IEEE80211_PREQ_TO_FLAG)) {
rtw_rcu_read_lock(); rtw_rcu_read_lock();
path = rtw_mesh_path_lookup(adapter, originator_addr); path = rtw_mesh_path_lookup(adapter, originator_addr);
if (path) { if (path) {
if (flags & RTW_IEEE80211_PREQ_PROACTIVE_PREP_FLAG) { if (flags & IEEE80211_PREQ_PROACTIVE_PREP_FLAG) {
reply = _TRUE; reply = _TRUE;
target_addr = adapter_mac_addr(adapter); target_addr = adapter_mac_addr(adapter);
target_sn = ++minfo->sn; target_sn = ++minfo->sn;
@ -722,13 +722,13 @@ static void rtw_hwmp_preq_frame_process(_adapter *adapter,
RTW_SN_LT(path->sn, target_sn)) { RTW_SN_LT(path->sn, target_sn)) {
path->sn = target_sn; path->sn = target_sn;
path->flags |= RTW_MESH_PATH_SN_VALID; path->flags |= RTW_MESH_PATH_SN_VALID;
} else if ((!(target_flags & RTW_IEEE80211_PREQ_TO_FLAG)) && } else if ((!(target_flags & IEEE80211_PREQ_TO_FLAG)) &&
(path->flags & RTW_MESH_PATH_ACTIVE)) { (path->flags & RTW_MESH_PATH_ACTIVE)) {
reply = _TRUE; reply = _TRUE;
target_metric = path->metric; target_metric = path->metric;
target_sn = path->sn; target_sn = path->sn;
/* Case E2 of sec 13.10.9.3 IEEE 802.11-2012*/ /* Case E2 of sec 13.10.9.3 IEEE 802.11-2012*/
target_flags |= RTW_IEEE80211_PREQ_TO_FLAG; target_flags |= IEEE80211_PREQ_TO_FLAG;
} }
} }
rtw_rcu_read_unlock(); rtw_rcu_read_unlock();
@ -748,7 +748,7 @@ static void rtw_hwmp_preq_frame_process(_adapter *adapter,
RTW_HWMP_DBG("replying to the PREQ (PREQ for us)\n"); RTW_HWMP_DBG("replying to the PREQ (PREQ for us)\n");
if (mshcfg->dot11MeshGateAnnouncementProtocol) { if (mshcfg->dot11MeshGateAnnouncementProtocol) {
/* BIT 7 is used to identify the prep is from mesh gate */ /* BIT 7 is used to identify the prep is from mesh gate */
to_gate_ask = RTW_IEEE80211_PREQ_IS_GATE_FLAG | BIT(7); to_gate_ask = IEEE80211_PREQ_IS_GATE_FLAG | BIT(7);
} else { } else {
to_gate_ask = 0; to_gate_ask = 0;
} }
@ -780,7 +780,7 @@ static void rtw_hwmp_preq_frame_process(_adapter *adapter,
da = (path && path->is_root) ? da = (path && path->is_root) ?
path->rann_snd_addr : bcast_addr; path->rann_snd_addr : bcast_addr;
if (flags & RTW_IEEE80211_PREQ_PROACTIVE_PREP_FLAG) { if (flags & IEEE80211_PREQ_PROACTIVE_PREP_FLAG) {
target_addr = RTW_PREQ_IE_TARGET_ADDR(preq_elem); target_addr = RTW_PREQ_IE_TARGET_ADDR(preq_elem);
target_sn = RTW_PREQ_IE_TARGET_SN(preq_elem); target_sn = RTW_PREQ_IE_TARGET_SN(preq_elem);
} }
@ -831,7 +831,7 @@ static void rtw_hwmp_prep_frame_process(_adapter *adapter,
enter_critical_bh(&path->state_lock); enter_critical_bh(&path->state_lock);
path->gate_asked = false; path->gate_asked = false;
exit_critical_bh(&path->state_lock); exit_critical_bh(&path->state_lock);
if (!(flags & RTW_IEEE80211_PREQ_IS_GATE_FLAG)) { if (!(flags & IEEE80211_PREQ_IS_GATE_FLAG)) {
enter_critical_bh(&path->state_lock); enter_critical_bh(&path->state_lock);
rtw_mesh_gate_del(adapter->mesh_info.mesh_paths, path); rtw_mesh_gate_del(adapter->mesh_info.mesh_paths, path);
exit_critical_bh(&path->state_lock); exit_critical_bh(&path->state_lock);
@ -957,7 +957,7 @@ static void rtw_hwmp_rann_frame_process(_adapter *adapter,
ttl = rann->rann_ttl; ttl = rann->rann_ttl;
flags = rann->rann_flags; flags = rann->rann_flags;
root_is_gate = !!(flags & RTW_RANN_FLAG_IS_GATE); root_is_gate = !!(flags & RANN_FLAG_IS_GATE);
originator_addr = rann->rann_addr; originator_addr = rann->rann_addr;
originator_sn = le32_to_cpu(rann->rann_seq); originator_sn = le32_to_cpu(rann->rann_seq);
interval = le32_to_cpu(rann->rann_interval); interval = le32_to_cpu(rann->rann_interval);
@ -1429,9 +1429,9 @@ void rtw_mesh_path_start_discovery(_adapter *adapter)
} }
if (preq_node->flags & RTW_PREQ_Q_F_REFRESH) if (preq_node->flags & RTW_PREQ_Q_F_REFRESH)
target_flags |= RTW_IEEE80211_PREQ_TO_FLAG; target_flags |= IEEE80211_PREQ_TO_FLAG;
else else
target_flags &= ~RTW_IEEE80211_PREQ_TO_FLAG; target_flags &= ~IEEE80211_PREQ_TO_FLAG;
#ifdef CONFIG_RTW_MESH_ADD_ROOT_CHK #ifdef CONFIG_RTW_MESH_ADD_ROOT_CHK
is_root_add_chk = !!(path->flags & RTW_MESH_PATH_ROOT_ADD_CHK); is_root_add_chk = !!(path->flags & RTW_MESH_PATH_ROOT_ADD_CHK);
@ -1443,7 +1443,7 @@ void rtw_mesh_path_start_discovery(_adapter *adapter)
#ifdef CONFIG_RTW_MESH_ON_DMD_GANN #ifdef CONFIG_RTW_MESH_ON_DMD_GANN
flags = (mshcfg->dot11MeshGateAnnouncementProtocol) flags = (mshcfg->dot11MeshGateAnnouncementProtocol)
? RTW_IEEE80211_PREQ_IS_GATE_FLAG : 0; ? IEEE80211_PREQ_IS_GATE_FLAG : 0;
#endif #endif
rtw_mesh_path_sel_frame_tx(RTW_MPATH_PREQ, flags, adapter_mac_addr(adapter), minfo->sn, rtw_mesh_path_sel_frame_tx(RTW_MPATH_PREQ, flags, adapter_mac_addr(adapter), minfo->sn,
target_flags, path->dst, path->sn, da, 0, target_flags, path->dst, path->sn, da, 0,
@ -1516,7 +1516,7 @@ void rtw_mesh_path_tx_root_frame(_adapter *adapter)
u8 flags, target_flags = 0; u8 flags, target_flags = 0;
flags = (mshcfg->dot11MeshGateAnnouncementProtocol) flags = (mshcfg->dot11MeshGateAnnouncementProtocol)
? RTW_RANN_FLAG_IS_GATE : 0; ? RANN_FLAG_IS_GATE : 0;
switch (mshcfg->dot11MeshHWMPRootMode) { switch (mshcfg->dot11MeshHWMPRootMode) {
case IEEE80211_PROACTIVE_RANN: case IEEE80211_PROACTIVE_RANN:
@ -1526,11 +1526,11 @@ void rtw_mesh_path_tx_root_frame(_adapter *adapter)
interval, 0, 0, adapter); interval, 0, 0, adapter);
break; break;
case IEEE80211_PROACTIVE_PREQ_WITH_PREP: case IEEE80211_PROACTIVE_PREQ_WITH_PREP:
flags |= RTW_IEEE80211_PREQ_PROACTIVE_PREP_FLAG; flags |= IEEE80211_PREQ_PROACTIVE_PREP_FLAG;
case IEEE80211_PROACTIVE_PREQ_NO_PREP: case IEEE80211_PROACTIVE_PREQ_NO_PREP:
interval = mshcfg->dot11MeshHWMPactivePathToRootTimeout; interval = mshcfg->dot11MeshHWMPactivePathToRootTimeout;
target_flags |= RTW_IEEE80211_PREQ_TO_FLAG | target_flags |= IEEE80211_PREQ_TO_FLAG |
RTW_IEEE80211_PREQ_USN_FLAG; IEEE80211_PREQ_USN_FLAG;
rtw_mesh_path_sel_frame_tx(RTW_MPATH_PREQ, flags, adapter_mac_addr(adapter), rtw_mesh_path_sel_frame_tx(RTW_MPATH_PREQ, flags, adapter_mac_addr(adapter),
++minfo->sn, target_flags, ++minfo->sn, target_flags,
(u8 *) bcast_addr, 0, bcast_addr, (u8 *) bcast_addr, 0, bcast_addr,

12
core/rtw_beamforming.c
View File

@ -1631,8 +1631,8 @@ u32 rtw_bf_get_report_packet(PADAPTER adapter, union recv_frame *precv_frame)
category = frame_body[0]; category = frame_body[0];
action = frame_body[1]; action = frame_body[1];
if ((category == RTW_WLAN_CATEGORY_VHT) if ((category == WLAN_CATEGORY_VHT)
&& (action == RTW_WLAN_ACTION_VHT_COMPRESSED_BEAMFORMING)) { && (action == WLAN_VHT_ACTION_COMPRESSED_BF)) {
pMIMOCtrlField = pframe + 26; pMIMOCtrlField = pframe + 26;
Nc = (*pMIMOCtrlField) & 0x7; Nc = (*pMIMOCtrlField) & 0x7;
Nr = ((*pMIMOCtrlField) & 0x38) >> 3; Nr = ((*pMIMOCtrlField) & 0x38) >> 3;
@ -1646,8 +1646,8 @@ u32 rtw_bf_get_report_packet(PADAPTER adapter, union recv_frame *precv_frame)
pCSIMatrix = pMIMOCtrlField + 3 + Nc; pCSIMatrix = pMIMOCtrlField + 3 + Nc;
CSIMatrixLen = frame_len - 26 - 3 - Nc; CSIMatrixLen = frame_len - 26 - 3 - Nc;
info->TargetCSIInfo.bVHT = _TRUE; info->TargetCSIInfo.bVHT = _TRUE;
} else if ((category == RTW_WLAN_CATEGORY_HT) } else if ((category == WLAN_CATEGORY_HT)
&& (action == RTW_WLAN_ACTION_HT_COMPRESS_BEAMFORMING)) { && (action == WLAN_HT_ACTION_COMPRESSED_BF)) {
pMIMOCtrlField = pframe + 26; pMIMOCtrlField = pframe + 26;
Nc = (*pMIMOCtrlField) & 0x3; Nc = (*pMIMOCtrlField) & 0x3;
Nr = ((*pMIMOCtrlField) & 0xC) >> 2; Nr = ((*pMIMOCtrlField) & 0xC) >> 2;
@ -1726,8 +1726,8 @@ u8 rtw_bf_send_vht_gid_mgnt_packet(PADAPTER adapter, u8 *ra, u8 *gid, u8 *positi
memcpy(wlanhdr->addr2, adapter_mac_addr(adapter), ETH_ALEN); memcpy(wlanhdr->addr2, adapter_mac_addr(adapter), ETH_ALEN);
memcpy(wlanhdr->addr3, get_bssid(mlmepriv), ETH_ALEN); memcpy(wlanhdr->addr3, get_bssid(mlmepriv), ETH_ALEN);
pframe[24] = RTW_WLAN_CATEGORY_VHT; pframe[24] = WLAN_CATEGORY_VHT;
pframe[25] = RTW_WLAN_ACTION_VHT_GROUPID_MANAGEMENT; pframe[25] = WLAN_VHT_ACTION_GROUPID_MGMT;
/* Set Membership Status Array */ /* Set Membership Status Array */
ptr = pframe + 26; ptr = pframe + 26;
memcpy(ptr, gid, 8); memcpy(ptr, gid, 8);

50
core/rtw_ieee80211.c
View File

@ -2663,50 +2663,6 @@ void rtw_bss_ex_del_wfd_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id)
} }
} }
/* Baron adds to avoid FreeBSD warning */
int ieee80211_is_empty_essid(const char *essid, int essid_len)
{
/* Single white space is for Linksys APs */
if (essid_len == 1 && essid[0] == ' ')
return 1;
/* Otherwise, if the entire essid is 0, we assume it is hidden */
while (essid_len) {
essid_len--;
if (essid[essid_len] != '\0')
return 0;
}
return 1;
}
int ieee80211_get_hdrlen(u16 fc)
{
int hdrlen = 24;
switch (WLAN_FC_GET_TYPE(fc)) {
case RTW_IEEE80211_FTYPE_DATA:
if (fc & RTW_IEEE80211_STYPE_QOS_DATA)
hdrlen += 2;
if ((fc & RTW_IEEE80211_FCTL_FROMDS) && (fc & RTW_IEEE80211_FCTL_TODS))
hdrlen += 6; /* Addr4 */
break;
case RTW_IEEE80211_FTYPE_CTL:
switch (WLAN_FC_GET_STYPE(fc)) {
case RTW_IEEE80211_STYPE_CTS:
case RTW_IEEE80211_STYPE_ACK:
hdrlen = 10;
break;
default:
hdrlen = 16;
break;
}
break;
}
return hdrlen;
}
u8 rtw_ht_mcsset_to_nss(u8 *supp_mcs_set) u8 rtw_ht_mcsset_to_nss(u8 *supp_mcs_set)
{ {
u8 nss = 1; u8 nss = 1;
@ -2826,15 +2782,15 @@ int rtw_action_frame_parse(const u8 *frame, u32 frame_len, u8 *category, u8 *act
fc = le16_to_cpu(((struct rtw_ieee80211_hdr_3addr *)frame)->frame_ctl); fc = le16_to_cpu(((struct rtw_ieee80211_hdr_3addr *)frame)->frame_ctl);
if ((fc & (RTW_IEEE80211_FCTL_FTYPE | RTW_IEEE80211_FCTL_STYPE)) if ((fc & ( IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE))
!= (RTW_IEEE80211_FTYPE_MGMT | RTW_IEEE80211_STYPE_ACTION) != (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION)
) )
return _FALSE; return _FALSE;
c = frame_body[0]; c = frame_body[0];
switch (c) { switch (c) {
case RTW_WLAN_CATEGORY_P2P: /* vendor-specific */ case WLAN_CATEGORY_VENDOR_SPECIFIC: /* vendor-specific */
break; break;
default: default:
a = frame_body[1]; a = frame_body[1];

122
core/rtw_mlme_ext.c
View File

@ -68,30 +68,30 @@ struct mlme_handler mlme_ap_tbl[] = {
#endif #endif
struct action_handler OnAction_tbl[] = { struct action_handler OnAction_tbl[] = {
{RTW_WLAN_CATEGORY_SPECTRUM_MGMT, "ACTION_SPECTRUM_MGMT", on_action_spct}, {WLAN_CATEGORY_SPECTRUM_MGMT, "ACTION_SPECTRUM_MGMT", on_action_spct},
{RTW_WLAN_CATEGORY_QOS, "ACTION_QOS", &OnAction_qos}, {WLAN_CATEGORY_QOS, "ACTION_QOS", &OnAction_qos},
{RTW_WLAN_CATEGORY_DLS, "ACTION_DLS", &OnAction_dls}, {WLAN_CATEGORY_DLS, "ACTION_DLS", &OnAction_dls},
{RTW_WLAN_CATEGORY_BACK, "ACTION_BACK", &OnAction_back}, {WLAN_CATEGORY_BACK, "ACTION_BACK", &OnAction_back},
{RTW_WLAN_CATEGORY_PUBLIC, "ACTION_PUBLIC", on_action_public}, {WLAN_CATEGORY_PUBLIC, "ACTION_PUBLIC", on_action_public},
{RTW_WLAN_CATEGORY_RADIO_MEAS, "ACTION_RADIO_MEAS", &on_action_rm}, {WLAN_CATEGORY_RADIO_MEASUREMENT, "ACTION_RADIO_MEAS", &on_action_rm},
{RTW_WLAN_CATEGORY_FT, "ACTION_FT", &OnAction_ft}, {WLAN_CATEGORY_FAST_BBS_TRANSITION, "ACTION_FT", &OnAction_ft},
{RTW_WLAN_CATEGORY_HT, "ACTION_HT", &OnAction_ht}, {WLAN_CATEGORY_HT, "ACTION_HT", &OnAction_ht},
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
{RTW_WLAN_CATEGORY_SA_QUERY, "ACTION_SA_QUERY", &OnAction_sa_query}, {WLAN_CATEGORY_SA_QUERY, "ACTION_SA_QUERY", &OnAction_sa_query},
#else #else
{RTW_WLAN_CATEGORY_SA_QUERY, "ACTION_SA_QUERY", &DoReserved}, {WLAN_CATEGORY_SA_QUERY, "ACTION_SA_QUERY", &DoReserved},
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_RTW_WNM #ifdef CONFIG_RTW_WNM
{RTW_WLAN_CATEGORY_WNM, "ACTION_WNM", &on_action_wnm}, {WLAN_CATEGORY_WNM, "ACTION_WNM", &on_action_wnm},
#endif #endif
{RTW_WLAN_CATEGORY_UNPROTECTED_WNM, "ACTION_UNPROTECTED_WNM", &DoReserved}, {WLAN_CATEGORY_WNM_UNPROTECTED, "ACTION_UNPROTECTED_WNM", &DoReserved},
#ifdef CONFIG_RTW_MESH #ifdef CONFIG_RTW_MESH
{RTW_WLAN_CATEGORY_MESH, "ACTION_MESH", &on_action_mesh}, {WLAN_CATEGORY_MESH_ACTION, "ACTION_MESH", &on_action_mesh},
{RTW_WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &on_action_self_protected}, {WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &on_action_self_protected},
#endif #endif
{RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &OnAction_wmm}, {WLAN_CATEGORY_WMM, "ACTION_WMM", &OnAction_wmm},
{RTW_WLAN_CATEGORY_VHT, "ACTION_VHT", &OnAction_vht}, {WLAN_CATEGORY_VHT, "ACTION_VHT", &OnAction_vht},
{RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p}, {WLAN_CATEGORY_VENDOR_SPECIFIC, "ACTION_P2P", &OnAction_p2p},
}; };
@ -1304,9 +1304,9 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
if ((index << 4) == IEEE80211_STYPE_ACTION) { if ((index << 4) == IEEE80211_STYPE_ACTION) {
/* category==public (4), action==TDLS_DISCOVERY_RESPONSE */ /* category==public (4), action==WLAN_TDLS_DISCOVERY_RESPONSE */
if (*(pframe + 24) == RTW_WLAN_CATEGORY_PUBLIC && *(pframe + 25) == TDLS_DISCOVERY_RESPONSE) { if (*(pframe + 24) == WLAN_CATEGORY_PUBLIC && *(pframe + 25) == WLAN_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))); RTW_INFO("[TDLS] Recv %s from "MAC_FMT"\n", rtw_tdls_action_txt(WLAN_TDLS_DISCOVERY_RESPONSE), MAC_ARG(get_addr2_ptr(pframe)));
On_TDLS_Dis_Rsp(padapter, precv_frame); On_TDLS_Dis_Rsp(padapter, precv_frame);
} }
} }
@ -3155,7 +3155,7 @@ unsigned int on_action_spct(_adapter *padapter, union recv_frame *precv_frame)
goto exit; goto exit;
category = frame_body[0]; category = frame_body[0];
if (category != RTW_WLAN_CATEGORY_SPECTRUM_MGMT) if (category != WLAN_CATEGORY_SPECTRUM_MGMT)
goto exit; goto exit;
action = frame_body[1]; action = frame_body[1];
@ -3217,7 +3217,7 @@ unsigned int on_action_wnm(_adapter *adapter, union recv_frame *rframe)
goto exit; goto exit;
category = frame_body[0]; category = frame_body[0];
if (category != RTW_WLAN_CATEGORY_WNM) if (category != WLAN_CATEGORY_WNM)
goto exit; goto exit;
action = frame_body[1]; action = frame_body[1];
@ -3620,7 +3620,7 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame)
frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr));
category = frame_body[0]; category = frame_body[0];
if (category == RTW_WLAN_CATEGORY_BACK) { /* representing Block Ack */ if (category == WLAN_CATEGORY_BACK) { /* representing Block Ack */
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
if ((psta->tdls_sta_state & TDLS_LINKED_STATE) && if ((psta->tdls_sta_state & TDLS_LINKED_STATE) &&
(psta->htpriv.ht_option == _TRUE) && (psta->htpriv.ht_option == _TRUE) &&
@ -3634,7 +3634,7 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame)
action = frame_body[1]; action = frame_body[1];
RTW_INFO("%s, action=%d\n", __FUNCTION__, action); RTW_INFO("%s, action=%d\n", __FUNCTION__, action);
switch (action) { switch (action) {
case RTW_WLAN_ACTION_ADDBA_REQ: /* ADDBA request */ case WLAN_ACTION_ADDBA_REQ: /* ADDBA request */
memcpy(&(pmlmeinfo->ADDBA_req), &(frame_body[2]), sizeof(struct ADDBA_request)); memcpy(&(pmlmeinfo->ADDBA_req), &(frame_body[2]), sizeof(struct ADDBA_request));
/* process_addba_req(padapter, (u8*)&(pmlmeinfo->ADDBA_req), GetAddr3Ptr(pframe)); */ /* process_addba_req(padapter, (u8*)&(pmlmeinfo->ADDBA_req), GetAddr3Ptr(pframe)); */
@ -3642,7 +3642,7 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame)
break; break;
case RTW_WLAN_ACTION_ADDBA_RESP: /* ADDBA response */ case WLAN_ACTION_ADDBA_RESP: /* ADDBA response */
/* status = frame_body[3] | (frame_body[4] << 8); */ /* endian issue */ /* status = frame_body[3] | (frame_body[4] << 8); */ /* endian issue */
status = RTW_GET_LE16(&frame_body[3]); status = RTW_GET_LE16(&frame_body[3]);
@ -3674,7 +3674,7 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame)
/* RTW_INFO("marc: ADDBA RSP: %x\n", pmlmeinfo->agg_enable_bitmap); */ /* RTW_INFO("marc: ADDBA RSP: %x\n", pmlmeinfo->agg_enable_bitmap); */
break; break;
case RTW_WLAN_ACTION_DELBA: /* DELBA */ case WLAN_ACTION_DELBA: /* DELBA */
if ((frame_body[3] & BIT(3)) == 0) { if ((frame_body[3] & BIT(3)) == 0) {
psta->htpriv.agg_enable_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf)); psta->htpriv.agg_enable_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf));
psta->htpriv.candidate_tid_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf)); psta->htpriv.candidate_tid_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf));
@ -3735,7 +3735,7 @@ int get_reg_classes_full_count(struct p2p_channels *channel_list)
void issue_p2p_GO_request(_adapter *padapter, u8 *raddr) void issue_p2p_GO_request(_adapter *padapter, u8 *raddr)
{ {
struct p2p_channels *ch_list = &(adapter_to_rfctl(padapter)->channel_list); struct p2p_channels *ch_list = &(adapter_to_rfctl(padapter)->channel_list);
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_GO_NEGO_REQ; u8 oui_subtype = P2P_GO_NEGO_REQ;
@ -4131,7 +4131,7 @@ void issue_p2p_GO_request(_adapter *padapter, u8 *raddr)
void issue_p2p_GO_response(_adapter *padapter, u8 *raddr, u8 *frame_body, uint len, u8 result) void issue_p2p_GO_response(_adapter *padapter, u8 *raddr, u8 *frame_body, uint len, u8 result)
{ {
struct p2p_channels *ch_list = &(adapter_to_rfctl(padapter)->channel_list); struct p2p_channels *ch_list = &(adapter_to_rfctl(padapter)->channel_list);
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_GO_NEGO_RESP; u8 oui_subtype = P2P_GO_NEGO_RESP;
@ -4548,7 +4548,7 @@ void issue_p2p_GO_response(_adapter *padapter, u8 *raddr, u8 *frame_body, uint l
void issue_p2p_GO_confirm(_adapter *padapter, u8 *raddr, u8 result) void issue_p2p_GO_confirm(_adapter *padapter, u8 *raddr, u8 result)
{ {
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_GO_NEGO_CONF; u8 oui_subtype = P2P_GO_NEGO_CONF;
@ -4782,7 +4782,7 @@ void issue_p2p_GO_confirm(_adapter *padapter, u8 *raddr, u8 result)
void issue_p2p_invitation_request(_adapter *padapter, u8 *raddr) void issue_p2p_invitation_request(_adapter *padapter, u8 *raddr)
{ {
struct p2p_channels *ch_list = &(adapter_to_rfctl(padapter)->channel_list); struct p2p_channels *ch_list = &(adapter_to_rfctl(padapter)->channel_list);
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_INVIT_REQ; u8 oui_subtype = P2P_INVIT_REQ;
@ -5080,7 +5080,7 @@ void issue_p2p_invitation_request(_adapter *padapter, u8 *raddr)
void issue_p2p_invitation_response(_adapter *padapter, u8 *raddr, u8 dialogToken, u8 status_code) void issue_p2p_invitation_response(_adapter *padapter, u8 *raddr, u8 dialogToken, u8 status_code)
{ {
struct p2p_channels *ch_list = &(adapter_to_rfctl(padapter)->channel_list); struct p2p_channels *ch_list = &(adapter_to_rfctl(padapter)->channel_list);
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_INVIT_RESP; u8 oui_subtype = P2P_INVIT_RESP;
@ -5314,7 +5314,7 @@ void issue_p2p_invitation_response(_adapter *padapter, u8 *raddr, u8 dialogToken
void issue_p2p_provision_request(_adapter *padapter, u8 *pssid, u8 ussidlen, u8 *pdev_raddr) void issue_p2p_provision_request(_adapter *padapter, u8 *pssid, u8 ussidlen, u8 *pdev_raddr)
{ {
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u8 dialogToken = 1; u8 dialogToken = 1;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
@ -6611,7 +6611,7 @@ unsigned int on_action_public(_adapter *padapter, union recv_frame *precv_frame)
goto exit; goto exit;
category = frame_body[0]; category = frame_body[0];
if (category != RTW_WLAN_CATEGORY_PUBLIC) if (category != WLAN_CATEGORY_PUBLIC)
goto exit; goto exit;
action = frame_body[1]; action = frame_body[1];
@ -6909,7 +6909,7 @@ unsigned int OnAction_ft(_adapter *padapter, union recv_frame *precv_frame)
pframe_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); pframe_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr);
category = pframe_body[0]; category = pframe_body[0];
if (category != RTW_WLAN_CATEGORY_FT) if (category != WLAN_CATEGORY_FAST_BBS_TRANSITION)
goto exit; goto exit;
action_code = pframe_body[1]; action_code = pframe_body[1];
@ -7164,7 +7164,7 @@ void rtw_wnm_issue_action(_adapter *padapter, u8 action, u8 reason)
pframe += sizeof(struct rtw_ieee80211_hdr_3addr); pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr); pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
category = RTW_WLAN_CATEGORY_WNM; category = WLAN_CATEGORY_WNM;
pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));
pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));
@ -7208,12 +7208,12 @@ unsigned int OnAction_ht(_adapter *padapter, union recv_frame *precv_frame)
goto exit; goto exit;
category = frame_body[0]; category = frame_body[0];
if (category != RTW_WLAN_CATEGORY_HT) if (category != WLAN_CATEGORY_HT)
goto exit; goto exit;
action = frame_body[1]; action = frame_body[1];
switch (action) { switch (action) {
case RTW_WLAN_ACTION_HT_SM_PS: case WLAN_HT_ACTION_SMPS:
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
if (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) if (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE)
@ -7221,9 +7221,9 @@ unsigned int OnAction_ht(_adapter *padapter, union recv_frame *precv_frame)
#endif /*CONFIG_AP_MODE*/ #endif /*CONFIG_AP_MODE*/
#endif /*CONFIG_80211N_HT*/ #endif /*CONFIG_80211N_HT*/
break; break;
case RTW_WLAN_ACTION_HT_COMPRESS_BEAMFORMING: case WLAN_HT_ACTION_COMPRESSED_BF:
#ifdef CONFIG_BEAMFORMING #ifdef CONFIG_BEAMFORMING
/*RTW_INFO("RTW_WLAN_ACTION_HT_COMPRESS_BEAMFORMING\n");*/ /*RTW_INFO("WLAN_HT_ACTION_COMPRESSED_BF\n");*/
rtw_beamforming_get_report_frame(padapter, precv_frame); rtw_beamforming_get_report_frame(padapter, precv_frame);
#endif /*CONFIG_BEAMFORMING*/ #endif /*CONFIG_BEAMFORMING*/
break; break;
@ -7309,25 +7309,25 @@ unsigned int OnAction_vht(_adapter *padapter, union recv_frame *precv_frame)
goto exit; goto exit;
category = frame_body[0]; category = frame_body[0];
if (category != RTW_WLAN_CATEGORY_VHT) if (category != WLAN_CATEGORY_VHT)
goto exit; goto exit;
action = frame_body[1]; action = frame_body[1];
switch (action) { switch (action) {
case RTW_WLAN_ACTION_VHT_COMPRESSED_BEAMFORMING: case WLAN_VHT_ACTION_COMPRESSED_BF:
#ifdef CONFIG_BEAMFORMING #ifdef CONFIG_BEAMFORMING
/*RTW_INFO("RTW_WLAN_ACTION_VHT_COMPRESSED_BEAMFORMING\n");*/ /*RTW_INFO("WLAN_VHT_ACTION_COMPRESSED_BF\n");*/
rtw_beamforming_get_report_frame(padapter, precv_frame); rtw_beamforming_get_report_frame(padapter, precv_frame);
#endif /*CONFIG_BEAMFORMING*/ #endif /*CONFIG_BEAMFORMING*/
break; break;
case RTW_WLAN_ACTION_VHT_OPMODE_NOTIFICATION: case WLAN_VHT_ACTION_OPMODE_NOTIF:
/* CategoryCode(1) + ActionCode(1) + OpModeNotification(1) */ /* CategoryCode(1) + ActionCode(1) + OpModeNotification(1) */
/* RTW_INFO("RTW_WLAN_ACTION_VHT_OPMODE_NOTIFICATION\n"); */ /* RTW_INFO("WLAN_VHT_ACTION_OPMODE_NOTIF\n"); */
psta = rtw_get_stainfo(&padapter->stapriv, whdr->addr2); psta = rtw_get_stainfo(&padapter->stapriv, whdr->addr2);
if (psta) if (psta)
rtw_process_vht_op_mode_notify(padapter, &frame_body[2], psta); rtw_process_vht_op_mode_notify(padapter, &frame_body[2], psta);
break; break;
case RTW_WLAN_ACTION_VHT_GROUPID_MANAGEMENT: case WLAN_VHT_ACTION_GROUPID_MGMT:
#ifdef CONFIG_BEAMFORMING #ifdef CONFIG_BEAMFORMING
#ifdef RTW_BEAMFORMING_VERSION_2 #ifdef RTW_BEAMFORMING_VERSION_2
rtw_beamforming_get_vht_gid_mgnt_frame(padapter, precv_frame); rtw_beamforming_get_vht_gid_mgnt_frame(padapter, precv_frame);
@ -7360,7 +7360,7 @@ unsigned int OnAction_p2p(_adapter *padapter, union recv_frame *precv_frame)
frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); frame_body = (unsigned char *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr));
category = frame_body[0]; category = frame_body[0];
if (category != RTW_WLAN_CATEGORY_P2P) if (category != WLAN_CATEGORY_VENDOR_SPECIFIC)
return _SUCCESS; return _SUCCESS;
if (cpu_to_be32(*((u32 *)(frame_body + 1))) != P2POUI) if (cpu_to_be32(*((u32 *)(frame_body + 1))) != P2POUI)
@ -9914,7 +9914,7 @@ void issue_action_spct_ch_switch(_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_of
/* category, action */ /* category, action */
{ {
u8 category, action; u8 category, action;
category = RTW_WLAN_CATEGORY_SPECTRUM_MGMT; category = WLAN_CATEGORY_SPECTRUM_MGMT;
action = RTW_WLAN_ACTION_SPCT_CHL_SWITCH; action = RTW_WLAN_ACTION_SPCT_CHL_SWITCH;
pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));
@ -9934,7 +9934,7 @@ void issue_action_spct_ch_switch(_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_of
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
void issue_action_SA_Query(_adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short tid, u8 key_type) void issue_action_SA_Query(_adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short tid, u8 key_type)
{ {
u8 category = RTW_WLAN_CATEGORY_SA_QUERY; u8 category = WLAN_CATEGORY_SA_QUERY;
u16 reason_code; u16 reason_code;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
@ -10037,7 +10037,7 @@ static int issue_action_ba(_adapter *padapter, unsigned char *raddr, unsigned ch
, u8 tid, u8 size, u16 status, u8 initiator, int wait_ack) , u8 tid, u8 size, u16 status, u8 initiator, int wait_ack)
{ {
int ret = _FAIL; int ret = _FAIL;
u8 category = RTW_WLAN_CATEGORY_BACK; u8 category = WLAN_CATEGORY_BACK;
u16 start_seq; u16 start_seq;
u16 BA_para_set; u16 BA_para_set;
u16 BA_timeout_value; u16 BA_timeout_value;
@ -10092,7 +10092,7 @@ static int issue_action_ba(_adapter *padapter, unsigned char *raddr, unsigned ch
if (category == 3) { if (category == 3) {
switch (action) { switch (action) {
case RTW_WLAN_ACTION_ADDBA_REQ: case WLAN_ACTION_ADDBA_REQ:
do { do {
pmlmeinfo->dialogToken++; pmlmeinfo->dialogToken++;
} while (pmlmeinfo->dialogToken == 0); } while (pmlmeinfo->dialogToken == 0);
@ -10134,7 +10134,7 @@ static int issue_action_ba(_adapter *padapter, unsigned char *raddr, unsigned ch
pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(BA_starting_seqctrl)), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(BA_starting_seqctrl)), &(pattrib->pktlen));
break; break;
case RTW_WLAN_ACTION_ADDBA_RESP: case WLAN_ACTION_ADDBA_RESP:
pframe = rtw_set_fixed_ie(pframe, 1, &(pmlmeinfo->ADDBA_req.dialog_token), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 1, &(pmlmeinfo->ADDBA_req.dialog_token), &(pattrib->pktlen));
status = cpu_to_le16(status); status = cpu_to_le16(status);
pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&status), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&status), &(pattrib->pktlen));
@ -10160,7 +10160,7 @@ static int issue_action_ba(_adapter *padapter, unsigned char *raddr, unsigned ch
pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(pmlmeinfo->ADDBA_req.BA_timeout_value)), &(pattrib->pktlen)); pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)(&(pmlmeinfo->ADDBA_req.BA_timeout_value)), &(pattrib->pktlen));
break; break;
case RTW_WLAN_ACTION_DELBA: case WLAN_ACTION_DELBA:
BA_para_set = 0; BA_para_set = 0;
BA_para_set |= (tid << 12) & IEEE80211_DELBA_PARAM_TID_MASK; BA_para_set |= (tid << 12) & IEEE80211_DELBA_PARAM_TID_MASK;
BA_para_set |= (initiator << 11) & IEEE80211_DELBA_PARAM_INITIATOR_MASK; BA_para_set |= (initiator << 11) & IEEE80211_DELBA_PARAM_INITIATOR_MASK;
@ -10197,7 +10197,7 @@ exit:
*/ */
inline void issue_addba_req(_adapter *adapter, unsigned char *ra, u8 tid) inline void issue_addba_req(_adapter *adapter, unsigned char *ra, u8 tid)
{ {
issue_action_ba(adapter, ra, RTW_WLAN_ACTION_ADDBA_REQ issue_action_ba(adapter, ra, WLAN_ACTION_ADDBA_REQ
, tid , tid
, 0 /* unused */ , 0 /* unused */
, 0 /* unused */ , 0 /* unused */
@ -10219,7 +10219,7 @@ inline void issue_addba_req(_adapter *adapter, unsigned char *ra, u8 tid)
*/ */
inline void issue_addba_rsp(_adapter *adapter, unsigned char *ra, u8 tid, u16 status, u8 size) inline void issue_addba_rsp(_adapter *adapter, unsigned char *ra, u8 tid, u16 status, u8 size)
{ {
issue_action_ba(adapter, ra, RTW_WLAN_ACTION_ADDBA_RESP issue_action_ba(adapter, ra, WLAN_ACTION_ADDBA_RESP
, tid , tid
, size , size
, status , status
@ -10251,7 +10251,7 @@ inline u8 issue_addba_rsp_wait_ack(_adapter *adapter, unsigned char *ra, u8 tid,
goto exit; goto exit;
do { do {
ret = issue_action_ba(adapter, ra, RTW_WLAN_ACTION_ADDBA_RESP ret = issue_action_ba(adapter, ra, WLAN_ACTION_ADDBA_RESP
, tid , tid
, size , size
, status , status
@ -10296,7 +10296,7 @@ exit:
*/ */
inline void issue_del_ba(_adapter *adapter, unsigned char *ra, u8 tid, u16 reason, u8 initiator) inline void issue_del_ba(_adapter *adapter, unsigned char *ra, u8 tid, u16 reason, u8 initiator)
{ {
issue_action_ba(adapter, ra, RTW_WLAN_ACTION_DELBA issue_action_ba(adapter, ra, WLAN_ACTION_DELBA
, tid , tid
, 0 /* unused */ , 0 /* unused */
, reason , reason
@ -10329,7 +10329,7 @@ int issue_del_ba_ex(_adapter *adapter, unsigned char *ra, u8 tid, u16 reason, u8
goto exit; goto exit;
do { do {
ret = issue_action_ba(adapter, ra, RTW_WLAN_ACTION_DELBA ret = issue_action_ba(adapter, ra, WLAN_ACTION_DELBA
, tid , tid
, 0 /* unused */ , 0 /* unused */
, reason , reason
@ -10394,7 +10394,7 @@ void issue_action_BSSCoexistPacket(_adapter *padapter)
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __FUNCTION__);
category = RTW_WLAN_CATEGORY_PUBLIC; category = WLAN_CATEGORY_PUBLIC;
action = ACT_PUBLIC_BSSCOEXIST; action = ACT_PUBLIC_BSSCOEXIST;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
@ -10518,8 +10518,8 @@ int _issue_action_SM_PS(_adapter *padapter , unsigned char *raddr , u8 NewMimoP
{ {
int ret = _FAIL; int ret = _FAIL;
unsigned char category = RTW_WLAN_CATEGORY_HT; unsigned char category = WLAN_CATEGORY_HT;
u8 action = RTW_WLAN_ACTION_HT_SM_PS; u8 action = WLAN_HT_ACTION_SMPS;
u8 sm_power_control = 0; u8 sm_power_control = 0;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
@ -13481,7 +13481,7 @@ void rtw_ft_issue_action_req(_adapter *padapter, u8 *pTargetAddr)
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
u8 *pframe; u8 *pframe;
u8 category = RTW_WLAN_CATEGORY_FT; u8 category = WLAN_CATEGORY_FAST_BBS_TRANSITION;
u8 action = RTW_WLAN_ACTION_FT_REQ; u8 action = RTW_WLAN_ACTION_FT_REQ;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);

18
core/rtw_p2p.c
View File

@ -148,7 +148,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
_adapter *padapter = pwdinfo->padapter; _adapter *padapter = pwdinfo->padapter;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
unsigned char category = RTW_WLAN_CATEGORY_P2P;/* P2P action frame */ unsigned char category = WLAN_CATEGORY_VENDOR_SPECIFIC;/* P2P action frame */
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_GO_DISC_REQUEST; u8 oui_subtype = P2P_GO_DISC_REQUEST;
u8 dialogToken = 0; u8 dialogToken = 0;
@ -206,7 +206,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
_adapter *padapter = pwdinfo->padapter; _adapter *padapter = pwdinfo->padapter;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_DEVDISC_RESP; u8 oui_subtype = P2P_DEVDISC_RESP;
@ -272,7 +272,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr, u8 *frame_body, u16 config_method) static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr, u8 *frame_body, u16 config_method)
{ {
_adapter *padapter = pwdinfo->padapter; _adapter *padapter = pwdinfo->padapter;
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u8 dialogToken = frame_body[7]; /* The Dialog Token of provisioning discovery request frame. */ u8 dialogToken = frame_body[7]; /* The Dialog Token of provisioning discovery request frame. */
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
@ -387,7 +387,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
_adapter *padapter = pwdinfo->padapter; _adapter *padapter = pwdinfo->padapter;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
unsigned char category = RTW_WLAN_CATEGORY_P2P;/* P2P action frame */ unsigned char category = WLAN_CATEGORY_VENDOR_SPECIFIC;/* P2P action frame */
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_PRESENCE_RESPONSE; u8 oui_subtype = P2P_PRESENCE_RESPONSE;
u8 p2pie[MAX_P2P_IE_LEN] = { 0x00 }; u8 p2pie[MAX_P2P_IE_LEN] = { 0x00 };
@ -3741,7 +3741,7 @@ u32 rtw_xframe_build_wfd_ie(struct xmit_frame *xframe)
u32 wfdielen = 0; u32 wfdielen = 0;
category = frame_body[0]; category = frame_body[0];
if (category == RTW_WLAN_CATEGORY_PUBLIC) { if (category == WLAN_CATEGORY_PUBLIC) {
action = frame_body[1]; action = frame_body[1];
if (action == ACT_PUBLIC_VENDOR if (action == ACT_PUBLIC_VENDOR
&& _rtw_memcmp(frame_body + 2, P2P_OUI, 4) == _TRUE && _rtw_memcmp(frame_body + 2, P2P_OUI, 4) == _TRUE
@ -3778,7 +3778,7 @@ u32 rtw_xframe_build_wfd_ie(struct xmit_frame *xframe)
} }
} }
} else if (category == RTW_WLAN_CATEGORY_P2P) { } else if (category == WLAN_CATEGORY_VENDOR_SPECIFIC) {
OUI_Subtype = frame_body[5]; OUI_Subtype = frame_body[5];
dialogToken = frame_body[6]; dialogToken = frame_body[6];
@ -3820,7 +3820,7 @@ bool rtw_xframe_del_wfd_ie(struct xmit_frame *xframe)
uint ies_len = 0; uint ies_len = 0;
category = frame_body[0]; category = frame_body[0];
if (category == RTW_WLAN_CATEGORY_PUBLIC) { if (category == WLAN_CATEGORY_PUBLIC) {
action = frame_body[1]; action = frame_body[1];
if (action == ACT_PUBLIC_VENDOR if (action == ACT_PUBLIC_VENDOR
&& _rtw_memcmp(frame_body + 2, P2P_OUI, 4) == _TRUE && _rtw_memcmp(frame_body + 2, P2P_OUI, 4) == _TRUE
@ -3961,7 +3961,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
frame_body = (unsigned char *)(buf + sizeof(struct rtw_ieee80211_hdr_3addr)); frame_body = (unsigned char *)(buf + sizeof(struct rtw_ieee80211_hdr_3addr));
category = frame_body[0]; category = frame_body[0];
/* just for check */ /* just for check */
if (category == RTW_WLAN_CATEGORY_PUBLIC) { if (category == WLAN_CATEGORY_PUBLIC) {
action = frame_body[1]; action = frame_body[1];
if (action == ACT_PUBLIC_VENDOR if (action == ACT_PUBLIC_VENDOR
&& _rtw_memcmp(frame_body + 2, P2P_OUI, 4) == _TRUE && _rtw_memcmp(frame_body + 2, P2P_OUI, 4) == _TRUE
@ -4298,7 +4298,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
} }
} else if (category == RTW_WLAN_CATEGORY_P2P) { } else if (category == WLAN_CATEGORY_VENDOR_SPECIFIC) {
OUI_Subtype = frame_body[5]; OUI_Subtype = frame_body[5];
dialogToken = frame_body[6]; dialogToken = frame_body[6];

24
core/rtw_recv.c
View File

@ -1013,8 +1013,8 @@ sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame)
ptdls_sta = rtw_get_stainfo(pstapriv, ieee80211_get_SA((struct ieee80211_hdr *)ptr)); ptdls_sta = rtw_get_stainfo(pstapriv, ieee80211_get_SA((struct ieee80211_hdr *)ptr));
if (ptdls_sta == NULL) { if (ptdls_sta == NULL) {
switch (*paction) { switch (*paction) {
case TDLS_SETUP_REQUEST: case WLAN_TDLS_SETUP_REQUEST:
case TDLS_DISCOVERY_REQUEST: case WLAN_TDLS_DISCOVERY_REQUEST:
break; break;
default: default:
RTW_INFO("[TDLS] %s - Direct Link Peer = "MAC_FMT" not found for action = %d\n", __func__, MAC_ARG(ieee80211_get_SA((struct ieee80211_hdr *)ptr)), *paction); RTW_INFO("[TDLS] %s - Direct Link Peer = "MAC_FMT" not found for action = %d\n", __func__, MAC_ARG(ieee80211_get_SA((struct ieee80211_hdr *)ptr)), *paction);
@ -1024,32 +1024,32 @@ sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame)
} }
switch (*paction) { switch (*paction) {
case TDLS_SETUP_REQUEST: case WLAN_TDLS_SETUP_REQUEST:
ret = On_TDLS_Setup_Req(adapter, precv_frame, ptdls_sta); ret = On_TDLS_Setup_Req(adapter, precv_frame, ptdls_sta);
break; break;
case TDLS_SETUP_RESPONSE: case WLAN_TDLS_SETUP_RESPONSE:
ret = On_TDLS_Setup_Rsp(adapter, precv_frame, ptdls_sta); ret = On_TDLS_Setup_Rsp(adapter, precv_frame, ptdls_sta);
break; break;
case TDLS_SETUP_CONFIRM: case WLAN_TDLS_SETUP_CONFIRM:
ret = On_TDLS_Setup_Cfm(adapter, precv_frame, ptdls_sta); ret = On_TDLS_Setup_Cfm(adapter, precv_frame, ptdls_sta);
break; break;
case TDLS_TEARDOWN: case WLAN_TDLS_TEARDOWN:
ret = On_TDLS_Teardown(adapter, precv_frame, ptdls_sta); ret = On_TDLS_Teardown(adapter, precv_frame, ptdls_sta);
break; break;
case TDLS_DISCOVERY_REQUEST: case WLAN_TDLS_DISCOVERY_REQUEST:
ret = On_TDLS_Dis_Req(adapter, precv_frame); ret = On_TDLS_Dis_Req(adapter, precv_frame);
break; break;
case TDLS_PEER_TRAFFIC_INDICATION: case WLAN_TDLS_PEER_TRAFFIC_INDICATION:
ret = On_TDLS_Peer_Traffic_Indication(adapter, precv_frame, ptdls_sta); ret = On_TDLS_Peer_Traffic_Indication(adapter, precv_frame, ptdls_sta);
break; break;
case TDLS_PEER_TRAFFIC_RESPONSE: case WLAN_TDLS_PEER_TRAFFIC_RESPONSE:
ret = On_TDLS_Peer_Traffic_Rsp(adapter, precv_frame, ptdls_sta); ret = On_TDLS_Peer_Traffic_Rsp(adapter, precv_frame, ptdls_sta);
break; break;
#ifdef CONFIG_TDLS_CH_SW #ifdef CONFIG_TDLS_CH_SW
case TDLS_CHANNEL_SWITCH_REQUEST: case WLAN_TDLS_CHANNEL_SWITCH_REQUEST:
ret = On_TDLS_Ch_Switch_Req(adapter, precv_frame, ptdls_sta); ret = On_TDLS_Ch_Switch_Req(adapter, precv_frame, ptdls_sta);
break; break;
case TDLS_CHANNEL_SWITCH_RESPONSE: case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE:
ret = On_TDLS_Ch_Switch_Rsp(adapter, precv_frame, ptdls_sta); ret = On_TDLS_Ch_Switch_Rsp(adapter, precv_frame, ptdls_sta);
break; break;
#endif #endif
@ -4351,7 +4351,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
pcategory = psnap_type + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN; pcategory = psnap_type + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN;
if ((_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_TDLS, ETH_TYPE_LEN)) && if ((_rtw_memcmp(psnap_type, SNAP_ETH_TYPE_TDLS, ETH_TYPE_LEN)) &&
((*pcategory == RTW_WLAN_CATEGORY_TDLS) || (*pcategory == RTW_WLAN_CATEGORY_P2P))) { ((*pcategory == WLAN_CATEGORY_TDLS) || (*pcategory == WLAN_CATEGORY_VENDOR_SPECIFIC))) {
ret = OnTDLS(padapter, prframe); ret = OnTDLS(padapter, prframe);
if (ret == _FAIL) if (ret == _FAIL)
goto _exit_recv_func; goto _exit_recv_func;

4
core/rtw_rm.c
View File

@ -282,7 +282,7 @@ u8 rm_add_nb_req(_adapter *padapter, struct sta_info *psta)
} }
prm->psta = psta; prm->psta = psta;
prm->q.category = RTW_WLAN_CATEGORY_RADIO_MEAS; prm->q.category = WLAN_CATEGORY_RADIO_MEASUREMENT;
prm->q.diag_token = pmlmeinfo->dialogToken++; prm->q.diag_token = pmlmeinfo->dialogToken++;
prm->q.m_token = 1; prm->q.m_token = 1;
@ -2279,7 +2279,7 @@ static void rm_dbg_add_meas(_adapter *padapter, char *s)
prmpriv->prm_sel = NULL; prmpriv->prm_sel = NULL;
return; return;
} }
prm->q.category = RTW_WLAN_CATEGORY_RADIO_MEAS; prm->q.category = WLAN_CATEGORY_RADIO_MEASUREMENT;
prm->q.e_id = _MEAS_REQ_IE_; /* 38 */ prm->q.e_id = _MEAS_REQ_IE_; /* 38 */
if (prm->q.action_code == RM_ACT_RADIO_MEAS_REQ) if (prm->q.action_code == RM_ACT_RADIO_MEAS_REQ)

2
core/rtw_rm_fsm.c
View File

@ -519,7 +519,7 @@ static int rm_state_idle(struct rm_obj *prm, enum RM_EV_ID evid)
u32 val32; u32 val32;
prm->p.category = RTW_WLAN_CATEGORY_RADIO_MEAS; prm->p.category = WLAN_CATEGORY_RADIO_MEASUREMENT;
switch (evid) { switch (evid) {
case RM_EV_state_in: case RM_EV_state_in:

92
core/rtw_tdls.c
View File

@ -1247,7 +1247,7 @@ int issue_tdls_setup_req(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, int wa
ptdlsinfo->sta_cnt++; ptdlsinfo->sta_cnt++;
} }
ptxmgmt->action_code = TDLS_SETUP_REQUEST; ptxmgmt->action_code = WLAN_TDLS_SETUP_REQUEST;
pattrib = &pmgntframe->attrib; pattrib = &pmgntframe->attrib;
pmgntframe->frame_tag = DATA_FRAMETAG; pmgntframe->frame_tag = DATA_FRAMETAG;
@ -1302,7 +1302,7 @@ int _issue_tdls_teardown(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, struct
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __FUNCTION__);
ptxmgmt->action_code = TDLS_TEARDOWN; ptxmgmt->action_code = WLAN_TDLS_TEARDOWN;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -1388,7 +1388,7 @@ int issue_tdls_dis_req(_adapter *padapter, struct tdls_txmgmt *ptxmgmt)
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __FUNCTION__);
ptxmgmt->action_code = TDLS_DISCOVERY_REQUEST; ptxmgmt->action_code = WLAN_TDLS_DISCOVERY_REQUEST;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
goto exit; goto exit;
@ -1427,7 +1427,7 @@ int issue_tdls_setup_rsp(_adapter *padapter, struct tdls_txmgmt *ptxmgmt)
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __FUNCTION__);
ptxmgmt->action_code = TDLS_SETUP_RESPONSE; ptxmgmt->action_code = WLAN_TDLS_SETUP_RESPONSE;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
goto exit; goto exit;
@ -1468,7 +1468,7 @@ int issue_tdls_setup_cfm(_adapter *padapter, struct tdls_txmgmt *ptxmgmt)
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __FUNCTION__);
ptxmgmt->action_code = TDLS_SETUP_CONFIRM; ptxmgmt->action_code = WLAN_TDLS_SETUP_CONFIRM;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
goto exit; goto exit;
@ -1565,7 +1565,7 @@ int issue_tdls_peer_traffic_rsp(_adapter *padapter, struct sta_info *ptdls_sta,
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __FUNCTION__);
ptxmgmt->action_code = TDLS_PEER_TRAFFIC_RESPONSE; ptxmgmt->action_code = WLAN_TDLS_PEER_TRAFFIC_RESPONSE;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -1610,7 +1610,7 @@ int issue_tdls_peer_traffic_indication(_adapter *padapter, struct sta_info *ptdl
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __FUNCTION__);
memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));
txmgmt.action_code = TDLS_PEER_TRAFFIC_INDICATION; txmgmt.action_code = WLAN_TDLS_PEER_TRAFFIC_INDICATION;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -1663,7 +1663,7 @@ int issue_tdls_ch_switch_req(_adapter *padapter, struct sta_info *ptdls_sta)
} }
memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));
txmgmt.action_code = TDLS_CHANNEL_SWITCH_REQUEST; txmgmt.action_code = WLAN_TDLS_CHANNEL_SWITCH_REQUEST;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -1709,7 +1709,7 @@ int issue_tdls_ch_switch_rsp(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, in
goto exit; goto exit;
} }
ptxmgmt->action_code = TDLS_CHANNEL_SWITCH_RESPONSE; ptxmgmt->action_code = WLAN_TDLS_CHANNEL_SWITCH_RESPONSE;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -2356,7 +2356,7 @@ int On_TDLS_Dis_Req(_adapter *padapter, union recv_frame *precv_frame)
ptr += prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN; ptr += prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN;
txmgmt.dialog_token = *(ptr + 2); txmgmt.dialog_token = *(ptr + 2);
memcpy(&txmgmt.peer, precv_frame->u.hdr.attrib.src, ETH_ALEN); memcpy(&txmgmt.peer, precv_frame->u.hdr.attrib.src, ETH_ALEN);
txmgmt.action_code = TDLS_DISCOVERY_RESPONSE; txmgmt.action_code = WLAN_TDLS_DISCOVERY_RESPONSE;
parsing_length = ((union recv_frame *)precv_frame)->u.hdr.len parsing_length = ((union recv_frame *)precv_frame)->u.hdr.len
- prx_pkt_attrib->hdrlen - prx_pkt_attrib->hdrlen
- prx_pkt_attrib->iv_len - prx_pkt_attrib->iv_len
@ -2815,7 +2815,7 @@ void rtw_build_tdls_setup_req_ies(_adapter *padapter, struct xmit_frame *pxmitfr
pframe_head = pframe; /* For rtw_tdls_set_ht_cap() */ pframe_head = pframe; /* For rtw_tdls_set_ht_cap() */
pframe = rtw_tdls_set_payload_type(pframe, pattrib); pframe = rtw_tdls_set_payload_type(pframe, pattrib);
pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS); pframe = rtw_tdls_set_category(pframe, pattrib, WLAN_CATEGORY_TDLS);
pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);
@ -2891,7 +2891,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter *padapter, struct xmit_frame *pxmitfr
pframe_head = pframe; pframe_head = pframe;
pframe = rtw_tdls_set_payload_type(pframe, pattrib); pframe = rtw_tdls_set_payload_type(pframe, pattrib);
pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS); pframe = rtw_tdls_set_category(pframe, pattrib, WLAN_CATEGORY_TDLS);
pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt);
@ -2980,7 +2980,7 @@ void rtw_build_tdls_setup_cfm_ies(_adapter *padapter, struct xmit_frame *pxmitfr
u8 *pftie = NULL, *ptimeout_ie = NULL, *plinkid_ie = NULL, *prsnie = NULL, *pftie_mic = NULL; u8 *pftie = NULL, *ptimeout_ie = NULL, *plinkid_ie = NULL, *prsnie = NULL, *pftie_mic = NULL;
pframe = rtw_tdls_set_payload_type(pframe, pattrib); pframe = rtw_tdls_set_payload_type(pframe, pattrib);
pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS); pframe = rtw_tdls_set_category(pframe, pattrib, WLAN_CATEGORY_TDLS);
pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);
@ -3042,7 +3042,7 @@ void rtw_build_tdls_teardown_ies(_adapter *padapter, struct xmit_frame *pxmitfra
u8 *pftie = NULL, *pftie_mic = NULL, *plinkid_ie = NULL; u8 *pftie = NULL, *pftie_mic = NULL, *plinkid_ie = NULL;
pframe = rtw_tdls_set_payload_type(pframe, pattrib); pframe = rtw_tdls_set_payload_type(pframe, pattrib);
pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS); pframe = rtw_tdls_set_category(pframe, pattrib, WLAN_CATEGORY_TDLS);
pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt);
@ -3071,7 +3071,7 @@ void rtw_build_tdls_dis_req_ies(_adapter *padapter, struct xmit_frame *pxmitfram
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
pframe = rtw_tdls_set_payload_type(pframe, pattrib); pframe = rtw_tdls_set_payload_type(pframe, pattrib);
pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS); pframe = rtw_tdls_set_category(pframe, pattrib, WLAN_CATEGORY_TDLS);
pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_linkid(padapter, pframe, pattrib, _TRUE); pframe = rtw_tdls_set_linkid(padapter, pframe, pattrib, _TRUE);
@ -3088,7 +3088,7 @@ void rtw_build_tdls_dis_rsp_ies(_adapter *padapter, struct xmit_frame *pxmitfram
pktlen_index = pattrib->pktlen; pktlen_index = pattrib->pktlen;
pframe_head = pframe; pframe_head = pframe;
pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_PUBLIC); pframe = rtw_tdls_set_category(pframe, pattrib, WLAN_CATEGORY_PUBLIC);
pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_capability(padapter, pframe, pattrib); pframe = rtw_tdls_set_capability(padapter, pframe, pattrib);
@ -3125,7 +3125,7 @@ void rtw_build_tdls_peer_traffic_indication_ies(_adapter *padapter, struct xmit_
u8 AC_queue = 0; u8 AC_queue = 0;
pframe = rtw_tdls_set_payload_type(pframe, pattrib); pframe = rtw_tdls_set_payload_type(pframe, pattrib);
pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS); pframe = rtw_tdls_set_category(pframe, pattrib, WLAN_CATEGORY_TDLS);
pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);
@ -3154,7 +3154,7 @@ void rtw_build_tdls_peer_traffic_rsp_ies(_adapter *padapter, struct xmit_frame *
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
pframe = rtw_tdls_set_payload_type(pframe, pattrib); pframe = rtw_tdls_set_payload_type(pframe, pattrib);
pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS); pframe = rtw_tdls_set_category(pframe, pattrib, WLAN_CATEGORY_TDLS);
pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);
@ -3176,7 +3176,7 @@ void rtw_build_tdls_ch_switch_req_ies(_adapter *padapter, struct xmit_frame *pxm
ptdls_sta->ch_switch_timeout = switch_timeout; ptdls_sta->ch_switch_timeout = switch_timeout;
pframe = rtw_tdls_set_payload_type(pframe, pattrib); pframe = rtw_tdls_set_payload_type(pframe, pattrib);
pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS); pframe = rtw_tdls_set_category(pframe, pattrib, WLAN_CATEGORY_TDLS);
pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_target_ch(padapter, pframe, pattrib); pframe = rtw_tdls_set_target_ch(padapter, pframe, pattrib);
pframe = rtw_tdls_set_reg_class(pframe, pattrib, ptdls_sta); pframe = rtw_tdls_set_reg_class(pframe, pattrib, ptdls_sta);
@ -3208,7 +3208,7 @@ void rtw_build_tdls_ch_switch_rsp_ies(_adapter *padapter, struct xmit_frame *pxm
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
pframe = rtw_tdls_set_payload_type(pframe, pattrib); pframe = rtw_tdls_set_payload_type(pframe, pattrib);
pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS); pframe = rtw_tdls_set_category(pframe, pattrib, WLAN_CATEGORY_TDLS);
pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);
pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt);
@ -3230,7 +3230,7 @@ void rtw_build_tunneled_probe_req_ies(_adapter *padapter, struct xmit_frame *pxm
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
struct wifidirect_info *pwdinfo; struct wifidirect_info *pwdinfo;
u8 category = RTW_WLAN_CATEGORY_P2P; u8 category = WLAN_CATEGORY_VENDOR_SPECIFIC;
u8 WFA_OUI[3] = { 0x50, 0x6f, 0x9a}; u8 WFA_OUI[3] = { 0x50, 0x6f, 0x9a};
u8 probe_req = 4; u8 probe_req = 4;
u8 wfdielen = 0; u8 wfdielen = 0;
@ -3260,7 +3260,7 @@ void rtw_build_tunneled_probe_rsp_ies(_adapter *padapter, struct xmit_frame *pxm
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
struct wifidirect_info *pwdinfo; struct wifidirect_info *pwdinfo;
u8 category = RTW_WLAN_CATEGORY_P2P; u8 category = WLAN_CATEGORY_VENDOR_SPECIFIC;
u8 WFA_OUI[3] = { 0x50, 0x6f, 0x9a}; u8 WFA_OUI[3] = { 0x50, 0x6f, 0x9a};
u8 probe_rsp = 5; u8 probe_rsp = 5;
u8 wfdielen = 0; u8 wfdielen = 0;
@ -3475,30 +3475,30 @@ int rtw_tdls_is_driver_setup(_adapter *padapter)
const char *rtw_tdls_action_txt(enum TDLS_ACTION_FIELD action) const char *rtw_tdls_action_txt(enum TDLS_ACTION_FIELD action)
{ {
switch (action) { switch (action) {
case TDLS_SETUP_REQUEST: case WLAN_TDLS_SETUP_REQUEST:
return "TDLS_SETUP_REQUEST"; return "WLAN_TDLS_SETUP_REQUEST";
case TDLS_SETUP_RESPONSE: case WLAN_TDLS_SETUP_RESPONSE:
return "TDLS_SETUP_RESPONSE"; return "WLAN_TDLS_SETUP_RESPONSE";
case TDLS_SETUP_CONFIRM: case WLAN_TDLS_SETUP_CONFIRM:
return "TDLS_SETUP_CONFIRM"; return "WLAN_TDLS_SETUP_CONFIRM";
case TDLS_TEARDOWN: case WLAN_TDLS_TEARDOWN:
return "TDLS_TEARDOWN"; return "WLAN_TDLS_TEARDOWN";
case TDLS_PEER_TRAFFIC_INDICATION: case WLAN_TDLS_PEER_TRAFFIC_INDICATION:
return "TDLS_PEER_TRAFFIC_INDICATION"; return "WLAN_TDLS_PEER_TRAFFIC_INDICATION";
case TDLS_CHANNEL_SWITCH_REQUEST: case WLAN_TDLS_CHANNEL_SWITCH_REQUEST:
return "TDLS_CHANNEL_SWITCH_REQUEST"; return "WLAN_TDLS_CHANNEL_SWITCH_REQUEST";
case TDLS_CHANNEL_SWITCH_RESPONSE: case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE:
return "TDLS_CHANNEL_SWITCH_RESPONSE"; return "WLAN_TDLS_CHANNEL_SWITCH_RESPONSE";
case TDLS_PEER_PSM_REQUEST: case WLAN_TDLS_PEER_PSM_REQUEST:
return "TDLS_PEER_PSM_REQUEST"; return "WLAN_TDLS_PEER_PSM_REQUEST";
case TDLS_PEER_PSM_RESPONSE: case WLAN_TDLS_PEER_PSM_RESPONSE:
return "TDLS_PEER_PSM_RESPONSE"; return "WLAN_TDLS_PEER_PSM_RESPONSE";
case TDLS_PEER_TRAFFIC_RESPONSE: case WLAN_TDLS_PEER_TRAFFIC_RESPONSE:
return "TDLS_PEER_TRAFFIC_RESPONSE"; return "WLAN_TDLS_PEER_TRAFFIC_RESPONSE";
case TDLS_DISCOVERY_REQUEST: case WLAN_TDLS_DISCOVERY_REQUEST:
return "TDLS_DISCOVERY_REQUEST"; return "WLAN_TDLS_DISCOVERY_REQUEST";
case TDLS_DISCOVERY_RESPONSE: case WLAN_TDLS_DISCOVERY_RESPONSE:
return "TDLS_DISCOVERY_RESPONSE"; return "WLAN_TDLS_DISCOVERY_RESPONSE";
default: default:
return "UNKNOWN"; return "UNKNOWN";
} }

46
core/rtw_xmit.c
View File

@ -1996,7 +1996,7 @@ int rtw_build_tdls_ies(_adapter *padapter, struct xmit_frame *pxmitframe, u8 *pf
ptdls_sta = rtw_get_stainfo((&padapter->stapriv), pattrib->dst); ptdls_sta = rtw_get_stainfo((&padapter->stapriv), pattrib->dst);
if (ptdls_sta == NULL) { if (ptdls_sta == NULL) {
switch (ptxmgmt->action_code) { switch (ptxmgmt->action_code) {
case TDLS_DISCOVERY_REQUEST: case WLAN_TDLS_DISCOVERY_REQUEST:
case TUNNELED_PROBE_REQ: case TUNNELED_PROBE_REQ:
case TUNNELED_PROBE_RSP: case TUNNELED_PROBE_RSP:
break; break;
@ -2008,33 +2008,33 @@ int rtw_build_tdls_ies(_adapter *padapter, struct xmit_frame *pxmitframe, u8 *pf
} }
switch (ptxmgmt->action_code) { switch (ptxmgmt->action_code) {
case TDLS_SETUP_REQUEST: case WLAN_TDLS_SETUP_REQUEST:
rtw_build_tdls_setup_req_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta); rtw_build_tdls_setup_req_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta);
break; break;
case TDLS_SETUP_RESPONSE: case WLAN_TDLS_SETUP_RESPONSE:
rtw_build_tdls_setup_rsp_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta); rtw_build_tdls_setup_rsp_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta);
break; break;
case TDLS_SETUP_CONFIRM: case WLAN_TDLS_SETUP_CONFIRM:
rtw_build_tdls_setup_cfm_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta); rtw_build_tdls_setup_cfm_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta);
break; break;
case TDLS_TEARDOWN: case WLAN_TDLS_TEARDOWN:
rtw_build_tdls_teardown_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta); rtw_build_tdls_teardown_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta);
break; break;
case TDLS_DISCOVERY_REQUEST: case WLAN_TDLS_DISCOVERY_REQUEST:
rtw_build_tdls_dis_req_ies(padapter, pxmitframe, pframe, ptxmgmt); rtw_build_tdls_dis_req_ies(padapter, pxmitframe, pframe, ptxmgmt);
break; break;
case TDLS_PEER_TRAFFIC_INDICATION: case WLAN_TDLS_PEER_TRAFFIC_INDICATION:
rtw_build_tdls_peer_traffic_indication_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta); rtw_build_tdls_peer_traffic_indication_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta);
break; break;
#ifdef CONFIG_TDLS_CH_SW #ifdef CONFIG_TDLS_CH_SW
case TDLS_CHANNEL_SWITCH_REQUEST: case WLAN_TDLS_CHANNEL_SWITCH_REQUEST:
rtw_build_tdls_ch_switch_req_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta); rtw_build_tdls_ch_switch_req_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta);
break; break;
case TDLS_CHANNEL_SWITCH_RESPONSE: case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE:
rtw_build_tdls_ch_switch_rsp_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta); rtw_build_tdls_ch_switch_rsp_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta);
break; break;
#endif #endif
case TDLS_PEER_TRAFFIC_RESPONSE: case WLAN_TDLS_PEER_TRAFFIC_RESPONSE:
rtw_build_tdls_peer_traffic_rsp_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta); rtw_build_tdls_peer_traffic_rsp_ies(padapter, pxmitframe, pframe, ptxmgmt, ptdls_sta);
break; break;
#ifdef CONFIG_WFD #ifdef CONFIG_WFD
@ -2073,29 +2073,29 @@ s32 rtw_make_tdls_wlanhdr(_adapter *padapter , u8 *hdr, struct pkt_attrib *pattr
set_frame_sub_type(fctrl, pattrib->subtype); set_frame_sub_type(fctrl, pattrib->subtype);
switch (ptxmgmt->action_code) { switch (ptxmgmt->action_code) {
case TDLS_SETUP_REQUEST: case WLAN_TDLS_SETUP_REQUEST:
case TDLS_SETUP_RESPONSE: case WLAN_TDLS_SETUP_RESPONSE:
case TDLS_SETUP_CONFIRM: case WLAN_TDLS_SETUP_CONFIRM:
case TDLS_PEER_TRAFFIC_INDICATION: case WLAN_TDLS_PEER_TRAFFIC_INDICATION:
case TDLS_PEER_PSM_REQUEST: case WLAN_TDLS_PEER_PSM_REQUEST:
case TUNNELED_PROBE_REQ: case TUNNELED_PROBE_REQ:
case TUNNELED_PROBE_RSP: case TUNNELED_PROBE_RSP:
case TDLS_DISCOVERY_REQUEST: case WLAN_TDLS_DISCOVERY_REQUEST:
SetToDs(fctrl); SetToDs(fctrl);
memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN); memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN); memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
break; break;
case TDLS_CHANNEL_SWITCH_REQUEST: case WLAN_TDLS_CHANNEL_SWITCH_REQUEST:
case TDLS_CHANNEL_SWITCH_RESPONSE: case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE:
case TDLS_PEER_PSM_RESPONSE: case WLAN_TDLS_PEER_PSM_RESPONSE:
case TDLS_PEER_TRAFFIC_RESPONSE: case WLAN_TDLS_PEER_TRAFFIC_RESPONSE:
memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN); memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
tdls_seq = 1; tdls_seq = 1;
break; break;
case TDLS_TEARDOWN: case WLAN_TDLS_TEARDOWN:
if (ptxmgmt->status_code == _RSON_TDLS_TEAR_UN_RSN_) { if (ptxmgmt->status_code == _RSON_TDLS_TEAR_UN_RSN_) {
memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
@ -2113,7 +2113,7 @@ s32 rtw_make_tdls_wlanhdr(_adapter *padapter , u8 *hdr, struct pkt_attrib *pattr
if (pattrib->encrypt) if (pattrib->encrypt)
SetPrivacy(fctrl); SetPrivacy(fctrl);
if (ptxmgmt->action_code == TDLS_PEER_TRAFFIC_RESPONSE) if (ptxmgmt->action_code == WLAN_TDLS_PEER_TRAFFIC_RESPONSE)
SetPwrMgt(fctrl); SetPwrMgt(fctrl);
if (pqospriv->qos_option) { if (pqospriv->qos_option) {
@ -4418,7 +4418,7 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev)
/* Check DATA/MGNT frames */ /* Check DATA/MGNT frames */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
frame_ctl = le16_to_cpu(pwlanhdr->frame_ctl); frame_ctl = le16_to_cpu(pwlanhdr->frame_ctl);
if ((frame_ctl & RTW_IEEE80211_FCTL_FTYPE) == RTW_IEEE80211_FTYPE_DATA) { if ((frame_ctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) {
pattrib = &pmgntframe->attrib; pattrib = &pmgntframe->attrib;
update_monitor_frame_attrib(padapter, pattrib); update_monitor_frame_attrib(padapter, pattrib);

6
hal/hal_com.c
View File

@ -6550,7 +6550,7 @@ static void rtw_hal_construct_P2PProbeRsp(_adapter *padapter, u8 *pframe, u32 *p
static void rtw_hal_construct_P2PNegoRsp(_adapter *padapter, u8 *pframe, u32 *pLength) static void rtw_hal_construct_P2PNegoRsp(_adapter *padapter, u8 *pframe, u32 *pLength)
{ {
struct p2p_channels *ch_list = &(adapter_to_rfctl(padapter)->channel_list); struct p2p_channels *ch_list = &(adapter_to_rfctl(padapter)->channel_list);
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_GO_NEGO_RESP; u8 oui_subtype = P2P_GO_NEGO_RESP;
@ -6953,7 +6953,7 @@ static void rtw_hal_construct_P2PNegoRsp(_adapter *padapter, u8 *pframe, u32 *pL
static void rtw_hal_construct_P2PInviteRsp(_adapter *padapter, u8 *pframe, u32 *pLength) static void rtw_hal_construct_P2PInviteRsp(_adapter *padapter, u8 *pframe, u32 *pLength)
{ {
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
u8 oui_subtype = P2P_INVIT_RESP; u8 oui_subtype = P2P_INVIT_RESP;
@ -7200,7 +7200,7 @@ static void rtw_hal_construct_P2PInviteRsp(_adapter *padapter, u8 *pframe, u32 *
static void rtw_hal_construct_P2PProvisionDisRsp(_adapter *padapter, u8 *pframe, u32 *pLength) static void rtw_hal_construct_P2PProvisionDisRsp(_adapter *padapter, u8 *pframe, u32 *pLength)
{ {
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u8 dialogToken = 0; u8 dialogToken = 0;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);

2
hal/rtl8192e/usb/rtl8192eu_xmit.c
View File

@ -939,7 +939,7 @@ s32 rtl8192eu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
fc = le16_to_cpu(tx_hdr->frame_ctl); fc = le16_to_cpu(tx_hdr->frame_ctl);
bmcst = is_multicast_ether_addr(tx_hdr->addr1); bmcst = is_multicast_ether_addr(tx_hdr->addr1);
if ((fc & RTW_IEEE80211_FCTL_FTYPE) != RTW_IEEE80211_FTYPE_MGMT) if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT)
goto _exit; goto _exit;
pxmit_skb = rtw_skb_alloc(len + TXDESC_SIZE); pxmit_skb = rtw_skb_alloc(len + TXDESC_SIZE);

2
hal/rtl8192e/usb/usb_ops_linux.c
View File

@ -179,7 +179,7 @@ int recvbuf2recvframe(PADAPTER padapter, void *ptr)
#ifdef CONFIG_RX_PACKET_APPEND_FCS #ifdef CONFIG_RX_PACKET_APPEND_FCS
if (check_fwstate(&padapter->mlmepriv, WIFI_MONITOR_STATE) == _FALSE) if (check_fwstate(&padapter->mlmepriv, WIFI_MONITOR_STATE) == _FALSE)
if ((pattrib->pkt_rpt_type == NORMAL_RX) && rtw_hal_rcr_check(padapter, RCR_APPFCS)) if ((pattrib->pkt_rpt_type == NORMAL_RX) && rtw_hal_rcr_check(padapter, RCR_APPFCS))
pattrib->pkt_len -= IEEE80211_FCS_LEN; pattrib->pkt_len -= FCS_LEN;
#endif #endif
if (rtw_os_alloc_recvframe(padapter, precvframe, if (rtw_os_alloc_recvframe(padapter, precvframe,

419
include/ieee80211.h
View File

File diff suppressed because it is too large Load Diff

32
os_dep/linux/ioctl_cfg80211.c
View File

@ -4504,7 +4504,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
dot11_hdr = (struct rtw_ieee80211_hdr *)skb->data; dot11_hdr = (struct rtw_ieee80211_hdr *)skb->data;
frame_ctl = le16_to_cpu(dot11_hdr->frame_ctl); frame_ctl = le16_to_cpu(dot11_hdr->frame_ctl);
/* Check if the QoS bit is set */ /* Check if the QoS bit is set */
if ((frame_ctl & RTW_IEEE80211_FCTL_FTYPE) == RTW_IEEE80211_FTYPE_DATA) { if ((frame_ctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) {
/* Check if this ia a Wireless Distribution System (WDS) frame /* Check if this ia a Wireless Distribution System (WDS) frame
* which has 4 MAC addresses * which has 4 MAC addresses
*/ */
@ -4531,8 +4531,8 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
return ret; return ret;
} else if ((frame_ctl & (RTW_IEEE80211_FCTL_FTYPE | RTW_IEEE80211_FCTL_STYPE)) } else if ((frame_ctl & ( IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE))
== (RTW_IEEE80211_FTYPE_MGMT | RTW_IEEE80211_STYPE_ACTION) == (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION)
) { ) {
/* only for action frames */ /* only for action frames */
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
@ -4561,7 +4561,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
if (type >= 0) if (type >= 0)
goto dump; goto dump;
#endif #endif
if (category == RTW_WLAN_CATEGORY_PUBLIC) if (category == WLAN_CATEGORY_PUBLIC)
RTW_INFO("RTW_Tx:%s\n", action_public_str(action)); RTW_INFO("RTW_Tx:%s\n", action_public_str(action));
else else
RTW_INFO("RTW_Tx:category(%u), action(%u)\n", category, action); RTW_INFO("RTW_Tx:category(%u), action(%u)\n", category, action);
@ -4601,7 +4601,7 @@ dump:
dump_mgntframe(padapter, pmgntframe); dump_mgntframe(padapter, pmgntframe);
} else } else
RTW_INFO("frame_ctl=0x%x\n", frame_ctl & (RTW_IEEE80211_FCTL_FTYPE | RTW_IEEE80211_FCTL_STYPE)); RTW_INFO("frame_ctl=0x%x\n", frame_ctl & ( IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE));
fail: fail:
@ -6203,7 +6203,7 @@ void rtw_cfg80211_rx_action(_adapter *adapter, union recv_frame *rframe, const c
} }
#endif #endif
rtw_action_frame_parse(frame, frame_len, &category, &action); rtw_action_frame_parse(frame, frame_len, &category, &action);
if (category == RTW_WLAN_CATEGORY_PUBLIC) { if (category == WLAN_CATEGORY_PUBLIC) {
if (action == ACT_PUBLIC_GAS_INITIAL_REQ) { if (action == ACT_PUBLIC_GAS_INITIAL_REQ) {
rtw_mi_set_scan_deny(adapter, 200); rtw_mi_set_scan_deny(adapter, 200);
rtw_mi_scan_abort(adapter, _FALSE); /*rtw_scan_abort_no_wait*/ rtw_mi_scan_abort(adapter, _FALSE); /*rtw_scan_abort_no_wait*/
@ -6286,7 +6286,7 @@ void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf,
u16 capability = 0; u16 capability = 0;
uint capability_len = 0; uint capability_len = 0;
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u8 dialogToken = 1; u8 dialogToken = 1;
u32 p2poui = cpu_to_be32(P2POUI); u32 p2poui = cpu_to_be32(P2POUI);
@ -7329,7 +7329,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
wait_ack = 0; wait_ack = 0;
goto dump; goto dump;
} }
else if (frame_styp == RTW_IEEE80211_STYPE_AUTH) { else if (frame_styp == IEEE80211_STYPE_AUTH) {
int retval = 0; int retval = 0;
RTW_INFO("RTW_Tx:tx_ch=%d, no_cck=%u, da="MAC_FMT"\n", tx_ch, no_cck, MAC_ARG(GetAddr1Ptr(buf))); RTW_INFO("RTW_Tx:tx_ch=%d, no_cck=%u, da="MAC_FMT"\n", tx_ch, no_cck, MAC_ARG(GetAddr1Ptr(buf)));
@ -7367,7 +7367,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
} }
} }
#endif #endif
if (category == RTW_WLAN_CATEGORY_PUBLIC) { if (category == WLAN_CATEGORY_PUBLIC) {
RTW_INFO("RTW_Tx:%s\n", action_public_str(action)); RTW_INFO("RTW_Tx:%s\n", action_public_str(action));
switch (action) { switch (action) {
case ACT_PUBLIC_GAS_INITIAL_REQ: case ACT_PUBLIC_GAS_INITIAL_REQ:
@ -7378,7 +7378,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
} }
} }
#ifdef CONFIG_RTW_80211K #ifdef CONFIG_RTW_80211K
else if (category == RTW_WLAN_CATEGORY_RADIO_MEAS) else if (category == WLAN_CATEGORY_RADIO_MEASUREMENT)
RTW_INFO("RTW_Tx: RRM Action\n"); RTW_INFO("RTW_Tx: RRM Action\n");
#endif #endif
else else
@ -7616,22 +7616,22 @@ static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
#endif #endif
switch (txmgmt.action_code) { switch (txmgmt.action_code) {
case TDLS_SETUP_REQUEST: case WLAN_TDLS_SETUP_REQUEST:
issue_tdls_setup_req(padapter, &txmgmt, _TRUE); issue_tdls_setup_req(padapter, &txmgmt, _TRUE);
break; break;
case TDLS_SETUP_RESPONSE: case WLAN_TDLS_SETUP_RESPONSE:
issue_tdls_setup_rsp(padapter, &txmgmt); issue_tdls_setup_rsp(padapter, &txmgmt);
break; break;
case TDLS_SETUP_CONFIRM: case WLAN_TDLS_SETUP_CONFIRM:
issue_tdls_setup_cfm(padapter, &txmgmt); issue_tdls_setup_cfm(padapter, &txmgmt);
break; break;
case TDLS_TEARDOWN: case WLAN_TDLS_TEARDOWN:
issue_tdls_teardown(padapter, &txmgmt, _TRUE); issue_tdls_teardown(padapter, &txmgmt, _TRUE);
break; break;
case TDLS_DISCOVERY_REQUEST: case WLAN_TDLS_DISCOVERY_REQUEST:
issue_tdls_dis_req(padapter, &txmgmt); issue_tdls_dis_req(padapter, &txmgmt);
break; break;
case TDLS_DISCOVERY_RESPONSE: case WLAN_TDLS_DISCOVERY_RESPONSE:
issue_tdls_dis_rsp(padapter, &txmgmt, pmlmeinfo->enc_algo ? _TRUE : _FALSE); issue_tdls_dis_rsp(padapter, &txmgmt, pmlmeinfo->enc_algo ? _TRUE : _FALSE);
break; break;
} }

21
os_dep/linux/ioctl_linux.c
View File

@ -6689,25 +6689,6 @@ static int wpa_set_param(struct net_device *dev, u8 name, u32 value)
* be set. * be set.
*/ */
#if 0
struct ieee80211_security sec = {
.flags = SEC_ENABLED,
.enabled = value,
};
ieee->drop_unencrypted = value;
/* We only change SEC_LEVEL for open mode. Others
* are set by ipw_wpa_set_encryption.
*/
if (!value) {
sec.flags |= SEC_LEVEL;
sec.level = SEC_LEVEL_0;
} else {
sec.flags |= SEC_LEVEL;
sec.level = SEC_LEVEL_1;
}
if (ieee->set_security)
ieee->set_security(ieee->dev, &sec);
#endif
break; break;
} }
@ -11642,7 +11623,7 @@ static u8 pktcmp(PADAPTER padapter, u8 *txbuf, u32 txsz, u8 *rxbuf, u32 rxsz)
phal = GET_HAL_DATA(padapter); phal = GET_HAL_DATA(padapter);
if (rtw_hal_rcr_check(padapter, RCR_APPFCS)) if (rtw_hal_rcr_check(padapter, RCR_APPFCS))
fcssize = IEEE80211_FCS_LEN; fcssize = FCS_LEN;
else else
fcssize = 0; fcssize = 0;