#include <drv_types.h>\r
\r
#ifdef CONFIG_TDLS\r
+#define ONE_SEC 1000 /* 1000 ms */\r
+\r
+extern unsigned char MCS_rate_2R[16];\r
+extern unsigned char MCS_rate_1R[16];\r
extern void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame);\r
\r
void rtw_reset_tdls_info(_adapter* padapter)\r
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;\r
\r
ptdlsinfo->ap_prohibited = _FALSE;\r
+ \r
+ /* For TDLS channel switch, currently we only allow it to work in wifi logo test mode */\r
+ if (padapter->registrypriv.wifi_spec == 1)\r
+ {\r
+ ptdlsinfo->ch_switch_prohibited = _FALSE;\r
+ }\r
+ else\r
+ {\r
+ ptdlsinfo->ch_switch_prohibited = _TRUE;\r
+ }\r
+\r
ptdlsinfo->link_established = _FALSE;\r
ptdlsinfo->sta_cnt = 0;\r
ptdlsinfo->sta_maximum = _FALSE;\r
+\r
+#ifdef CONFIG_TDLS_CH_SW\r
+ ptdlsinfo->chsw_info.ch_sw_state = TDLS_STATE_NONE;\r
+ ATOMIC_SET(&ptdlsinfo->chsw_info.chsw_on, _FALSE);\r
+ ptdlsinfo->chsw_info.off_ch_num = 0;\r
+ ptdlsinfo->chsw_info.ch_offset = 0;\r
+ ptdlsinfo->chsw_info.cur_time = 0;\r
+ ptdlsinfo->chsw_info.delay_switch_back = _FALSE;\r
+ ptdlsinfo->chsw_info.dump_stack = _FALSE;\r
+#endif\r
+ \r
ptdlsinfo->ch_sensing = 0;\r
- ptdlsinfo->cur_channel = 0;\r
- ptdlsinfo->candidate_ch = 1; //when inplement channel switching, default candidate channel is 1\r
ptdlsinfo->watchdog_count = 0;\r
- ptdlsinfo->dev_discovered = 0;\r
+ ptdlsinfo->dev_discovered = _FALSE;\r
\r
#ifdef CONFIG_WFD\r
ptdlsinfo->wfd_info = &padapter->wfd_info;\r
-#endif //CONFIG_WFD\r
+#endif /* ONFIG_WFD */\r
}\r
\r
int rtw_init_tdls_info(_adapter* padapter)\r
int res = _SUCCESS;\r
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;\r
\r
- ptdlsinfo->tdls_enable = _TRUE;\r
rtw_reset_tdls_info(padapter);\r
\r
+ ptdlsinfo->tdls_enable = _TRUE;\r
+#ifdef CONFIG_TDLS_DRIVER_SETUP\r
+ ptdlsinfo->driver_setup = _TRUE;\r
+#else\r
+ ptdlsinfo->driver_setup = _FALSE;\r
+#endif /* CONFIG_TDLS_DRIVER_SETUP */\r
+\r
_rtw_spinlock_init(&ptdlsinfo->cmd_lock);\r
_rtw_spinlock_init(&ptdlsinfo->hdl_lock);\r
\r
\r
}\r
\r
+int check_ap_tdls_prohibited(u8 *pframe, u8 pkt_len)\r
+{\r
+ u8 tdls_prohibited_bit = 0x40; /* bit(38); TDLS_prohibited */\r
+\r
+ if (pkt_len < 5) {\r
+ return _FALSE;\r
+ }\r
+\r
+ pframe += 4;\r
+ if ((*pframe) & tdls_prohibited_bit)\r
+ return _TRUE;\r
+\r
+ return _FALSE;\r
+}\r
+\r
+int check_ap_tdls_ch_switching_prohibited(u8 *pframe, u8 pkt_len)\r
+{\r
+ u8 tdls_ch_swithcing_prohibited_bit = 0x80; /* bit(39); TDLS_channel_switching prohibited */\r
+\r
+ if (pkt_len < 5) {\r
+ return _FALSE;\r
+ }\r
+\r
+ pframe += 4;\r
+ if ((*pframe) & tdls_ch_swithcing_prohibited_bit)\r
+ return _TRUE;\r
+\r
+ return _FALSE;\r
+}\r
+\r
int _issue_nulldata_to_TDLS_peer_STA(_adapter *padapter, unsigned char *da, unsigned int power_mode, int wait_ack)\r
{\r
int ret = _FAIL;\r
struct pkt_attrib *pattrib;\r
unsigned char *pframe;\r
struct rtw_ieee80211_hdr *pwlanhdr;\r
- unsigned short *fctrl;\r
+ unsigned short *fctrl, *qc;\r
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);\r
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);\r
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);\r
\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
\r
- //update attribute\r
pattrib = &pmgntframe->attrib;\r
update_mgntframe_attrib(padapter, pattrib);\r
+\r
+ pattrib->hdrlen +=2;\r
+ pattrib->qos_en = _TRUE;\r
+ pattrib->eosp = 1;\r
+ pattrib->ack_policy = 0;\r
+ pattrib->mdata = 0; \r
pattrib->retry_ctrl = _FALSE;\r
\r
_rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET);\r
fctrl = &(pwlanhdr->frame_ctl);\r
*(fctrl) = 0;\r
\r
- // SetToDs(fctrl);\r
-\r
if (power_mode)\r
- {\r
SetPwrMgt(fctrl);\r
- }\r
+\r
+ qc = (unsigned short *)(pframe + pattrib->hdrlen - 2);\r
+ \r
+ SetPriority(qc, 7); /* Set priority to VO */\r
+\r
+ SetEOSP(qc, pattrib->eosp);\r
+\r
+ SetAckpolicy(qc, pattrib->ack_policy);\r
\r
_rtw_memcpy(pwlanhdr->addr1, da, ETH_ALEN);\r
- _rtw_memcpy(pwlanhdr->addr2, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pwlanhdr->addr2, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pwlanhdr->addr3, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN);\r
\r
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);\r
pmlmeext->mgnt_seq++;\r
- SetFrameSubType(pframe, WIFI_DATA_NULL);\r
+ SetFrameSubType(pframe, WIFI_QOS_DATA_NULL);\r
\r
- pframe += sizeof(struct rtw_ieee80211_hdr_3addr);\r
- pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);\r
+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr_qos);\r
+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr_qos);\r
\r
pattrib->last_txcmdsz = pattrib->pktlen;\r
\r
- if(wait_ack)\r
- {\r
+ if (wait_ack)\r
ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe);\r
- }\r
- else\r
- {\r
+ else {\r
dump_mgntframe(padapter, pmgntframe);\r
ret = _SUCCESS;\r
}\r
return ret;\r
\r
}\r
-\r
int issue_nulldata_to_TDLS_peer_STA(_adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms)\r
{\r
int ret;\r
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);\r
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);\r
\r
- //[TDLS] UAPSD : merge this from issue_nulldata() and mark it first.\r
#if 0\r
psta = rtw_get_stainfo(&padapter->stapriv, da);\r
if (psta) {\r
}\r
#endif\r
\r
- do\r
- {\r
+ do {\r
ret = _issue_nulldata_to_TDLS_peer_STA(padapter, da, power_mode, wait_ms>0 ? _TRUE : _FALSE);\r
\r
i++;\r
if (padapter->bDriverStopped || padapter->bSurpriseRemoved)\r
break;\r
\r
- if(i < try_cnt && wait_ms > 0 && ret==_FAIL)\r
+ if (i < try_cnt && wait_ms > 0 && ret == _FAIL)\r
rtw_msleep_os(wait_ms);\r
\r
- }while((i<try_cnt) && ((ret==_FAIL)||(wait_ms==0)));\r
+ } while ((i < try_cnt) && (ret==_FAIL || wait_ms==0));\r
\r
if (ret != _FAIL) {\r
ret = _SUCCESS;\r
struct sta_priv *pstapriv = &padapter->stapriv;\r
_irqL irqL;\r
\r
- //free peer sta_info\r
+ /* free peer sta_info */\r
_enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);\r
- if(ptdlsinfo->sta_cnt != 0)\r
+ if (ptdlsinfo->sta_cnt != 0)\r
ptdlsinfo->sta_cnt--;\r
_exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);\r
- if( ptdlsinfo->sta_cnt < (NUM_STA - 2 - 4) ) // -2: AP + BC/MC sta, -4: default key\r
- {\r
+ /* -2: AP + BC/MC sta, -4: default key */\r
+ if (ptdlsinfo->sta_cnt < MAX_ALLOWED_TDLS_STA_NUM) {\r
ptdlsinfo->sta_maximum = _FALSE;\r
_rtw_memset( &ptdlsinfo->ss_record, 0x00, sizeof(struct tdls_ss_record) );\r
}\r
\r
- //clear cam\r
+ /* clear cam */\r
rtw_clearstakey_cmd(padapter, ptdls_sta, _TRUE);\r
\r
- if(ptdlsinfo->sta_cnt==0){\r
- rtw_tdls_cmd(padapter, myid(&(padapter->eeprompriv)), TDLS_RS_RCR);\r
+ if (ptdlsinfo->sta_cnt == 0) {\r
+ rtw_tdls_cmd(padapter, NULL, TDLS_RS_RCR);\r
ptdlsinfo->link_established = _FALSE;\r
}\r
else\r
}\r
\r
\r
-//TDLS encryption(if needed) will always be CCMP\r
-void rtw_tdls_set_key(_adapter *padapter, struct rx_pkt_attrib *prx_pkt_attrib, struct sta_info *ptdls_sta)\r
+/* TDLS encryption(if needed) will always be CCMP */\r
+void rtw_tdls_set_key(_adapter *padapter, struct sta_info *ptdls_sta)\r
{\r
- if(prx_pkt_attrib->encrypt)\r
- {\r
- ptdls_sta->dot118021XPrivacy=_AES_;\r
- rtw_setstakey_cmd(padapter, ptdls_sta, _TRUE, _TRUE);\r
- }\r
+ ptdls_sta->dot118021XPrivacy=_AES_;\r
+ rtw_setstakey_cmd(padapter, ptdls_sta, TDLS_KEY, _TRUE);\r
}\r
\r
void rtw_tdls_process_ht_cap(_adapter *padapter, struct sta_info *ptdls_sta, u8 *data, u8 Length)\r
{\r
- /* save HT capabilities in the sta object */\r
+ /* Save HT capabilities in the sta object */\r
_rtw_memset(&ptdls_sta->htpriv.ht_cap, 0, sizeof(struct rtw_ieee80211_ht_cap));\r
- if (data && Length >= sizeof(struct rtw_ieee80211_ht_cap) )\r
- {\r
+ if (data && Length >= sizeof(struct rtw_ieee80211_ht_cap)) {\r
ptdls_sta->flags |= WLAN_STA_HT;\r
- \r
ptdls_sta->flags |= WLAN_STA_WME;\r
- \r
+\r
_rtw_memcpy(&ptdls_sta->htpriv.ht_cap, data, sizeof(struct rtw_ieee80211_ht_cap)); \r
- \r
} else\r
ptdls_sta->flags &= ~WLAN_STA_HT;\r
\r
- if(ptdls_sta->flags & WLAN_STA_HT)\r
- {\r
- if(padapter->registrypriv.ht_enable == _TRUE)\r
- {\r
+ if (ptdls_sta->flags & WLAN_STA_HT) {\r
+ if (padapter->registrypriv.ht_enable == _TRUE) {\r
ptdls_sta->htpriv.ht_option = _TRUE;\r
- }\r
- else\r
- {\r
+ ptdls_sta->qos_option = _TRUE;\r
+ } else {\r
ptdls_sta->htpriv.ht_option = _FALSE;\r
- ptdls_sta->stat_code = _STATS_FAILURE_;\r
+ ptdls_sta->qos_option = _FALSE;\r
}\r
}\r
\r
- //HT related cap\r
- if(ptdls_sta->htpriv.ht_option)\r
- {\r
- //check if sta supports rx ampdu\r
- if(padapter->registrypriv.ampdu_enable==1)\r
+ /* HT related cap */\r
+ if (ptdls_sta->htpriv.ht_option) {\r
+ /* Check if sta supports rx ampdu */\r
+ if (padapter->registrypriv.ampdu_enable == 1)\r
ptdls_sta->htpriv.ampdu_enable = _TRUE;\r
\r
- //check if sta support s Short GI 20M\r
- if(ptdls_sta->htpriv.ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SGI_20))\r
- {\r
+ /* Check if sta support s Short GI 20M */\r
+ if (ptdls_sta->htpriv.ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SGI_20))\r
ptdls_sta->htpriv.sgi_20m = _TRUE;\r
- }\r
- //check if sta support s Short GI 40M\r
- if(ptdls_sta->htpriv.ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SGI_40))\r
- {\r
+\r
+ /* Check if sta support s Short GI 40M */\r
+ if (ptdls_sta->htpriv.ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SGI_40))\r
ptdls_sta->htpriv.sgi_40m = _TRUE;\r
- }\r
\r
- // bwmode would still followed AP's setting\r
- if(ptdls_sta->htpriv.ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH))\r
- {\r
+ /* Bwmode would still followed AP's setting */\r
+ if (ptdls_sta->htpriv.ht_cap.cap_info & cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH)) {\r
if (padapter->mlmeextpriv.cur_bwmode >= CHANNEL_WIDTH_40)\r
ptdls_sta->bw_mode = CHANNEL_WIDTH_40;\r
ptdls_sta->htpriv.ch_offset = padapter->mlmeextpriv.cur_ch_offset;\r
\r
}\r
\r
-int rtw_tdls_set_ht_cap(_adapter *padapter, u8 *pframe, struct pkt_attrib *pattrib)\r
+u8 *rtw_tdls_set_ht_cap(_adapter *padapter, u8 *pframe, struct pkt_attrib *pattrib)\r
{\r
- int tmplen;\r
-\r
rtw_ht_use_default_setting(padapter);\r
\r
- tmplen = pattrib->pktlen;\r
rtw_restructure_ht_ie(padapter, NULL, pframe, 0, &(pattrib->pktlen), padapter->mlmeextpriv.cur_channel);\r
\r
- return (pattrib->pktlen - tmplen);\r
-\r
+ return pframe + pattrib->pktlen;\r
}\r
\r
u8 *rtw_tdls_set_sup_ch(struct mlme_ext_priv *pmlmeext, u8 *pframe, struct pkt_attrib *pattrib)\r
u8 ch_24g = 0, b1 = 0, b4 = 0;\r
u8 bit_table = 0, sup_ch_idx = 0;\r
\r
- do{\r
- if( pmlmeext->channel_set[ch_set_idx].ChannelNum >= 1 &&\r
- pmlmeext->channel_set[ch_set_idx].ChannelNum <= 14 )\r
- {\r
- ch_24g = 1; // 2.4 G channels\r
- }\r
- else if( pmlmeext->channel_set[ch_set_idx].ChannelNum >= 36 && \r
+ do {\r
+ if (pmlmeext->channel_set[ch_set_idx].ChannelNum >= 1 &&\r
+ pmlmeext->channel_set[ch_set_idx].ChannelNum <= 14)\r
+ ch_24g = 1; /* 2.4 G channels */\r
+ else if (pmlmeext->channel_set[ch_set_idx].ChannelNum >= 36 && \r
pmlmeext->channel_set[ch_set_idx].ChannelNum <= 48)\r
- {\r
- b1 = 1; // 5 G band1\r
- }\r
- else if( pmlmeext->channel_set[ch_set_idx].ChannelNum >= 149 && \r
+ b1 = 1; /* 5 G band1 */\r
+ else if (pmlmeext->channel_set[ch_set_idx].ChannelNum >= 149 && \r
pmlmeext->channel_set[ch_set_idx].ChannelNum <= 165)\r
- {\r
- b4 = 1; // 5 G band4\r
- }\r
- else\r
- {\r
- ch_set_idx++; // We don't claim that we support DFS channels.\r
+ b4 = 1; /* 5 G band4 */\r
+ else {\r
+ ch_set_idx++; /* We don't support DFS channels. */\r
continue;\r
}\r
\r
sup_ch_idx = (ch_24g + b1 + b4 - 1) * 2;\r
- if( sup_ch_idx >= 0)\r
- {\r
- if(sup_ch[sup_ch_idx] == 0)\r
+ if (sup_ch_idx >= 0) {\r
+ if (sup_ch[sup_ch_idx] == 0)\r
sup_ch[sup_ch_idx] = pmlmeext->channel_set[ch_set_idx].ChannelNum;\r
sup_ch[sup_ch_idx+1]++; //Number of channel\r
}\r
\r
ch_set_idx++;\r
- }\r
- while( pmlmeext->channel_set[ch_set_idx].ChannelNum != 0 && ch_set_idx < MAX_CHANNEL_NUM );\r
+ } while (pmlmeext->channel_set[ch_set_idx].ChannelNum != 0 && ch_set_idx < MAX_CHANNEL_NUM);\r
\r
return(rtw_set_ie(pframe, _SUPPORTED_CH_IE_, sup_ch_idx+2, sup_ch, &(pattrib->pktlen)));\r
}\r
\r
+u8 *rtw_tdls_set_rsnie(struct tdls_txmgmt *ptxmgmt, u8 *pframe, struct pkt_attrib *pattrib, int init, struct sta_info *ptdls_sta)\r
+{\r
+ u8 *p = NULL;\r
+ int len = 0;\r
+\r
+ if (ptxmgmt->len > 0)\r
+ p = rtw_get_ie(ptxmgmt->buf, _RSN_IE_2_, &len, ptxmgmt->len);\r
+\r
+ if (p != NULL)\r
+ return rtw_set_ie(pframe, _RSN_IE_2_, len, p+2, &(pattrib->pktlen));\r
+ else\r
+ if (init == _TRUE)\r
+ return rtw_set_ie(pframe, _RSN_IE_2_, sizeof(TDLS_RSNIE), TDLS_RSNIE, &(pattrib->pktlen));\r
+ else\r
+ return rtw_set_ie(pframe, _RSN_IE_2_, sizeof(ptdls_sta->TDLS_RSNIE), ptdls_sta->TDLS_RSNIE, &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_ext_cap(u8 *pframe, struct pkt_attrib *pattrib)\r
+{\r
+ return rtw_set_ie(pframe, _EXT_CAP_IE_ , sizeof(TDLS_EXT_CAPIE), TDLS_EXT_CAPIE, &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_qos_cap(u8 *pframe, struct pkt_attrib *pattrib)\r
+{\r
+ return rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, sizeof(TDLS_WMMIE), TDLS_WMMIE, &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_ftie(struct tdls_txmgmt *ptxmgmt, u8 *pframe, struct pkt_attrib *pattrib, u8 *ANonce, u8 *SNonce)\r
+{\r
+ struct wpa_tdls_ftie FTIE = {0};\r
+ u8 *p = NULL;\r
+ int len = 0;\r
+\r
+ if (ptxmgmt->len > 0)\r
+ p = rtw_get_ie(ptxmgmt->buf, _FTIE_, &len, ptxmgmt->len);\r
+\r
+ if (p != NULL)\r
+ return rtw_set_ie(pframe, _FTIE_, len, p+2, &(pattrib->pktlen));\r
+ else {\r
+ if (ANonce != NULL)\r
+ _rtw_memcpy(FTIE.Anonce, ANonce, WPA_NONCE_LEN);\r
+ if (SNonce != NULL)\r
+ _rtw_memcpy(FTIE.Snonce, SNonce, WPA_NONCE_LEN);\r
+ return rtw_set_ie(pframe, _FTIE_ , 82, (u8 *)FTIE.mic_ctrl, &(pattrib->pktlen));\r
+ }\r
+}\r
+\r
+u8 *rtw_tdls_set_timeout_interval(struct tdls_txmgmt *ptxmgmt, u8 *pframe, struct pkt_attrib *pattrib, int init, struct sta_info *ptdls_sta)\r
+{\r
+ u8 timeout_itvl[5]; /* set timeout interval to maximum value */\r
+ u32 timeout_interval= TPK_RESEND_COUNT;\r
+ u8 *p = NULL;\r
+ int len = 0;\r
+\r
+ if (ptxmgmt->len > 0)\r
+ p = rtw_get_ie(ptxmgmt->buf, _TIMEOUT_ITVL_IE_, &len, ptxmgmt->len);\r
+\r
+ if (p != NULL)\r
+ return rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, len, p+2, &(pattrib->pktlen));\r
+ else {\r
+ /* Timeout interval */\r
+ timeout_itvl[0]=0x02;\r
+ if (init == _TRUE)\r
+ _rtw_memcpy(timeout_itvl+1, &timeout_interval, 4);\r
+ else\r
+ _rtw_memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4);\r
+\r
+ return rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen));\r
+ }\r
+}\r
+\r
+u8 *rtw_tdls_set_bss_coexist(_adapter *padapter, u8 *pframe, struct pkt_attrib *pattrib)\r
+{\r
+ u8 iedata=0;\r
+\r
+ if (padapter->mlmepriv.num_FortyMHzIntolerant > 0)\r
+ iedata |= BIT(2); /* 20 MHz BSS Width Request */\r
+\r
+ /* Information Bit should be set by TDLS test plan 5.9 */\r
+ iedata |= BIT(0);\r
+ return rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_payload_type(u8 *pframe, struct pkt_attrib *pattrib)\r
+{\r
+ u8 payload_type = 0x02;\r
+ return rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_category(u8 *pframe, struct pkt_attrib *pattrib, u8 category)\r
+{\r
+ return rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_action(u8 *pframe, struct pkt_attrib *pattrib, struct tdls_txmgmt *ptxmgmt)\r
+{\r
+ return rtw_set_fixed_ie(pframe, 1, &(ptxmgmt->action_code), &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_status_code(u8 *pframe, struct pkt_attrib *pattrib, struct tdls_txmgmt *ptxmgmt)\r
+{\r
+ return rtw_set_fixed_ie(pframe, 2, (u8 *)&(ptxmgmt->status_code), &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_dialog(u8 *pframe, struct pkt_attrib *pattrib, struct tdls_txmgmt *ptxmgmt)\r
+{\r
+ u8 dialogtoken = 1;\r
+ if (ptxmgmt->dialog_token)\r
+ return rtw_set_fixed_ie(pframe, 1, &(ptxmgmt->dialog_token), &(pattrib->pktlen));\r
+ else\r
+ return rtw_set_fixed_ie(pframe, 1, &(dialogtoken), &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_reg_class(u8 *pframe, struct pkt_attrib *pattrib, struct sta_info *ptdls_sta)\r
+{\r
+ u8 reg_class = 1;\r
+ return rtw_set_fixed_ie(pframe, 1, &(reg_class), &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_capability(_adapter *padapter, u8 *pframe, struct pkt_attrib *pattrib)\r
+{\r
+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;\r
+ struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;\r
+ u8 cap_from_ie[2] = {0};\r
+\r
+ _rtw_memcpy(cap_from_ie, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2);\r
+\r
+ return rtw_set_fixed_ie(pframe, 2, cap_from_ie, &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_supported_rate(_adapter *padapter, u8 *pframe, struct pkt_attrib *pattrib)\r
+{\r
+ u8 bssrate[NDIS_802_11_LENGTH_RATES_EX];\r
+ int bssrate_len = 0;\r
+ u8 more_supportedrates = 0;\r
+\r
+ rtw_set_supported_rate(bssrate, padapter->registrypriv.wireless_mode);\r
+ bssrate_len = rtw_get_rateset_len(bssrate);\r
+\r
+ if (bssrate_len > 8) {\r
+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen));\r
+ more_supportedrates = 1;\r
+ } else {\r
+ pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen));\r
+ }\r
+\r
+ /* extended supported rates */\r
+ if (more_supportedrates == 1) {\r
+ pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));\r
+ }\r
+\r
+ return pframe;\r
+}\r
+\r
+u8 *rtw_tdls_set_sup_reg_class(u8 *pframe, struct pkt_attrib *pattrib)\r
+{\r
+ return rtw_set_ie(pframe, _SRC_IE_ , sizeof(TDLS_SRC), TDLS_SRC, &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_linkid(u8 *pframe, struct pkt_attrib *pattrib, u8 init)\r
+{\r
+ u8 link_id_addr[18] = {0};\r
+ if (init == _TRUE) {\r
+ _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
+ _rtw_memcpy((link_id_addr+6), pattrib->src, 6);\r
+ _rtw_memcpy((link_id_addr+12), pattrib->dst, 6);\r
+ } else {\r
+ _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
+ _rtw_memcpy((link_id_addr+6), pattrib->dst, 6);\r
+ _rtw_memcpy((link_id_addr+12), pattrib->src, 6);\r
+ }\r
+ return rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
+}\r
+\r
+#ifdef CONFIG_TDLS_CH_SW\r
+u8 *rtw_tdls_set_target_ch(_adapter *padapter, u8 *pframe, struct pkt_attrib *pattrib)\r
+{\r
+ u8 target_ch = 1;\r
+ if (padapter->tdlsinfo.chsw_info.off_ch_num)\r
+ return rtw_set_fixed_ie(pframe, 1, &(padapter->tdlsinfo.chsw_info.off_ch_num), &(pattrib->pktlen));\r
+ else\r
+ return rtw_set_fixed_ie(pframe, 1, &(target_ch), &(pattrib->pktlen));\r
+}\r
+\r
+u8 *rtw_tdls_set_ch_sw(u8 *pframe, struct pkt_attrib *pattrib, struct sta_info *ptdls_sta)\r
+{\r
+ u8 ch_switch_timing[4] = {0};\r
+ u16 switch_time = (ptdls_sta->ch_switch_time >= CH_SWITCH_TIME * 1000) ? \r
+ ptdls_sta->ch_switch_time : CH_SWITCH_TIME;\r
+ u16 switch_timeout = (ptdls_sta->ch_switch_timeout >= CH_SWITCH_TIMEOUT * 1000) ? \r
+ ptdls_sta->ch_switch_timeout : CH_SWITCH_TIMEOUT;\r
+\r
+ _rtw_memcpy(ch_switch_timing, &switch_time, 2);\r
+ _rtw_memcpy(ch_switch_timing + 2, &switch_timeout, 2);\r
+\r
+ return rtw_set_ie(pframe, _CH_SWITCH_TIMING_, 4, ch_switch_timing, &(pattrib->pktlen));\r
+}\r
+#endif\r
+\r
+u8 *rtw_tdls_set_wmm_params(_adapter *padapter, u8 *pframe, struct pkt_attrib *pattrib)\r
+{\r
+ struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); \r
+ struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);\r
+ u8 wmm_param_ele[24] = {0};\r
+\r
+ if (&pmlmeinfo->WMM_param) {\r
+ _rtw_memcpy(wmm_param_ele, WMM_PARA_OUI, 6);\r
+ if (_rtw_memcmp(&pmlmeinfo->WMM_param, &wmm_param_ele[6], 18) == _TRUE)\r
+ /* Use default WMM Param */\r
+ _rtw_memcpy(wmm_param_ele + 6, (u8 *)&TDLS_WMM_PARAM_IE, sizeof(TDLS_WMM_PARAM_IE));\r
+ else \r
+ _rtw_memcpy(wmm_param_ele + 6, (u8 *)&pmlmeinfo->WMM_param, sizeof(pmlmeinfo->WMM_param));\r
+ return rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 24, wmm_param_ele, &(pattrib->pktlen)); \r
+ }\r
+ else\r
+ return pframe;\r
+}\r
+\r
#ifdef CONFIG_WFD\r
void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length)\r
{\r
u8 wfd_ie[ 128 ] = { 0x00 };\r
u32 wfd_ielen = 0;\r
u32 wfd_offset = 0;\r
- // Try to get the TCP port information when receiving the negotiation response.\r
- //\r
+ /* Try to get the TCP port information when receiving the negotiation response. */\r
\r
wfd_offset = 0;\r
wfd_offset = rtw_get_wfd_ie( ptr + wfd_offset, length - wfd_offset, wfd_ie, &wfd_ielen );\r
- while( wfd_offset )\r
- {\r
+ while (wfd_offset) {\r
u8 attr_content[ 10 ] = { 0x00 };\r
u32 attr_contentlen = 0;\r
int i;\r
\r
DBG_871X( "[%s] WFD IE Found!!\n", __FUNCTION__ );\r
rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);\r
- if ( attr_contentlen )\r
- {\r
+ if (attr_contentlen) {\r
ptdlsinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 );\r
DBG_871X( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport );\r
}\r
_rtw_memset( attr_content, 0x00, 10);\r
attr_contentlen = 0;\r
rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_LOCAL_IP_ADDR, attr_content, &attr_contentlen);\r
- if ( attr_contentlen )\r
- {\r
+ if (attr_contentlen) {\r
_rtw_memcpy(ptdlsinfo->wfd_info->peer_ip_address, ( attr_content + 1 ), 4);\r
DBG_871X( "[%s] Peer IP = %02u.%02u.%02u.%02u \n", __FUNCTION__, \r
ptdlsinfo->wfd_info->peer_ip_address[0], ptdlsinfo->wfd_info->peer_ip_address[1],\r
- ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3]\r
- );\r
+ ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3]);\r
}\r
wfd_offset = rtw_get_wfd_ie( ptr + wfd_offset, length - wfd_offset, wfd_ie, &wfd_ielen );\r
}\r
txmgmt.action_code = TUNNELED_PROBE_REQ;\r
\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
- \r
- //update attribute\r
+\r
pattrib = &pmgntframe->attrib;\r
\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
_rtw_memcpy(pattrib->dst, baddr, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
txmgmt.action_code = TUNNELED_PROBE_RSP;\r
\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
- \r
- //update attribute\r
+\r
pattrib = &pmgntframe->attrib;\r
\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
_rtw_memcpy(pattrib->dst, precv_frame->u.hdr.attrib.src, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
\r
return ret;\r
}\r
-#endif //CONFIG_WFD\r
+#endif /* CONFIG_WFD */\r
\r
int issue_tdls_setup_req(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, int wait_ack)\r
{\r
struct sta_priv *pstapriv = &padapter->stapriv;\r
struct sta_info *ptdls_sta= NULL;\r
_irqL irqL;\r
- static u8 dialogtoken = 0;\r
int ret = _FAIL;\r
- u32 timeout_interval= TPK_RESEND_COUNT * 1000; //retry timer should set at least 301 sec, using TPK_count counting 301 times.\r
+ /* Retry timer should be set at least 301 sec, using TPK_count counting 301 times. */\r
+ u32 timeout_interval= TPK_RESEND_COUNT;\r
+\r
+ DBG_871X("[TDLS] %s\n", __FUNCTION__);\r
\r
ptxmgmt->action_code = TDLS_SETUP_REQUEST;\r
- if(ptdlsinfo->ap_prohibited == _TRUE)\r
+ if (ptdlsinfo->ap_prohibited == _TRUE)\r
goto exit;\r
\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
- \r
- //update attribute\r
+\r
pattrib = &pmgntframe->attrib;\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
_rtw_memcpy(pattrib->dst, ptxmgmt->peer, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
update_tdls_attrib(padapter, pattrib);\r
\r
- //init peer sta_info\r
+ /* init peer sta_info */\r
ptdls_sta = rtw_get_stainfo(pstapriv, ptxmgmt->peer);\r
- if(ptdls_sta==NULL)\r
- {\r
+ if (ptdls_sta == NULL) {\r
ptdls_sta = rtw_alloc_stainfo(pstapriv, ptxmgmt->peer);\r
- if(ptdls_sta==NULL)\r
- {\r
+ if (ptdls_sta == NULL) {\r
DBG_871X("[%s] rtw_alloc_stainfo fail\n", __FUNCTION__); \r
rtw_free_xmitbuf(pxmitpriv,pmgntframe->pxmitbuf);\r
rtw_free_xmitframe(pxmitpriv, pmgntframe);\r
\r
if(!(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE))\r
ptdlsinfo->sta_cnt++;\r
- if( ptdlsinfo->sta_cnt == (NUM_STA - 2 - 4) ) // -2: AP + BC/MC sta, -4: default key\r
- {\r
+\r
+ if (ptdlsinfo->sta_cnt == MAX_ALLOWED_TDLS_STA_NUM)\r
ptdlsinfo->sta_maximum = _TRUE;\r
- }\r
\r
ptdls_sta->tdls_sta_state |= TDLS_RESPONDER_STATE;\r
- //for tdls; ptdls_sta->aid is used to fill dialogtoken\r
- ptdls_sta->dialog = dialogtoken;\r
- dialogtoken = (dialogtoken+1)%256;\r
- ptdls_sta->TDLS_PeerKey_Lifetime = timeout_interval;\r
- _set_timer( &ptdls_sta->handshake_timer, TDLS_HANDSHAKE_TIME );\r
+\r
+ if (rtw_tdls_is_driver_setup(padapter) == _TRUE) {\r
+ ptdls_sta->TDLS_PeerKey_Lifetime = timeout_interval;\r
+ _set_timer(&ptdls_sta->handshake_timer, TDLS_HANDSHAKE_TIME);\r
+ }\r
\r
pattrib->qsel = pattrib->priority;\r
\r
- if(rtw_xmit_tdls_coalesce(padapter, pmgntframe, ptxmgmt) !=_SUCCESS ){\r
+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, ptxmgmt) !=_SUCCESS) {\r
rtw_free_xmitbuf(pxmitpriv,pmgntframe->pxmitbuf);\r
rtw_free_xmitframe(pxmitpriv, pmgntframe);\r
goto exit;\r
ret = _SUCCESS;\r
}\r
\r
- ret = _SUCCESS;\r
-\r
exit:\r
\r
return ret;\r
}\r
\r
-int issue_tdls_teardown(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, u8 wait_ack)\r
+int _issue_tdls_teardown(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, u8 wait_ack)\r
{\r
struct xmit_frame *pmgntframe;\r
struct pkt_attrib *pattrib;\r
_irqL irqL;\r
int ret = _FAIL;\r
\r
+ DBG_871X("[TDLS] %s\n", __FUNCTION__);\r
+\r
ptxmgmt->action_code = TDLS_TEARDOWN;\r
ptdls_sta = rtw_get_stainfo(pstapriv, ptxmgmt->peer);\r
- if(ptdls_sta==NULL){\r
+ if (ptdls_sta == NULL) {\r
DBG_871X("Np tdls_sta for tearing down\n");\r
goto exit;\r
}\r
\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
- \r
- //update attribute\r
+\r
+ rtw_set_scan_deny(padapter, 550);\r
+\r
+ rtw_scan_abort(padapter);\r
+#ifdef CONFIG_CONCURRENT_MODE \r
+ if (rtw_buddy_adapter_up(padapter)) \r
+ rtw_scan_abort(padapter->pbuddy_adapter);\r
+#endif /* CONFIG_CONCURRENT_MODE */\r
+\r
pattrib = &pmgntframe->attrib;\r
\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
_rtw_memcpy(pattrib->dst, ptxmgmt->peer, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
goto exit;\r
}\r
\r
+ if (rtw_tdls_is_driver_setup(padapter) == _TRUE) \r
+ if(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE)\r
+ if (pattrib->encrypt) \r
+ _cancel_timer_ex(&ptdls_sta->TPK_timer);\r
+\r
if (wait_ack) {\r
ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe);\r
} else {\r
ret = _SUCCESS;\r
}\r
\r
- if(ret == _SUCCESS)\r
- {\r
- if(ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE){\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CS_OFF);\r
- }\r
- \r
- if( ptdls_sta->timer_flag == 1 )\r
- {\r
- _enter_critical_bh(&(padapter->tdlsinfo.hdl_lock), &irqL);\r
- ptdls_sta->timer_flag = 2;\r
- _exit_critical_bh(&(padapter->tdlsinfo.hdl_lock), &irqL);\r
- }\r
- else\r
- rtw_tdls_cmd(padapter, ptxmgmt->peer, TDLS_TEAR_STA );\r
- }\r
+ if (ret == _SUCCESS && rtw_tdls_is_driver_setup(padapter))\r
+ rtw_tdls_cmd(padapter, ptxmgmt->peer, TDLS_TEAR_STA);\r
\r
exit:\r
\r
return ret;\r
}\r
\r
+int issue_tdls_teardown(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, u8 wait_ack)\r
+{\r
+ int ret = _FAIL;\r
+ \r
+ ret = _issue_tdls_teardown(padapter, ptxmgmt, wait_ack);\r
+ if ((ptxmgmt->status_code == _RSON_TDLS_TEAR_UN_RSN_) && (ret == _FAIL)) {\r
+ /* Change status code and send teardown again via AP */\r
+ ptxmgmt->status_code = _RSON_TDLS_TEAR_TOOFAR_;\r
+ ret = _issue_tdls_teardown(padapter, ptxmgmt, wait_ack);\r
+ }\r
+\r
+ return ret;\r
+}\r
+\r
int issue_tdls_dis_req(_adapter *padapter, struct tdls_txmgmt *ptxmgmt)\r
{\r
struct xmit_frame *pmgntframe;\r
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);\r
int ret = _FAIL;\r
\r
+ DBG_871X("[TDLS] %s\n", __FUNCTION__);\r
+ \r
ptxmgmt->action_code = TDLS_DISCOVERY_REQUEST;\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
\r
- //update attribute\r
pattrib = &pmgntframe->attrib;\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
_rtw_memcpy(pattrib->dst, ptxmgmt->peer, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);\r
int ret = _FAIL;\r
\r
+ DBG_871X("[TDLS] %s\n", __FUNCTION__);\r
+\r
ptxmgmt->action_code = TDLS_SETUP_RESPONSE; \r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
- \r
- //update attribute\r
+\r
pattrib = &pmgntframe->attrib;\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
_rtw_memcpy(pattrib->dst, ptxmgmt->peer, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(&(padapter->mlmepriv)), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);\r
int ret = _FAIL;\r
\r
+ DBG_871X("[TDLS] %s\n", __FUNCTION__);\r
+ \r
ptxmgmt->action_code = TDLS_SETUP_CONFIRM;\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
- \r
- //update attribute\r
+\r
pattrib = &pmgntframe->attrib;\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
_rtw_memcpy(pattrib->dst, ptxmgmt->peer, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&padapter->eeprompriv), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(&padapter->mlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
\r
}\r
\r
-//TDLS Discovery Response frame is a management action frame\r
+/* TDLS Discovery Response frame is a management action frame */\r
int issue_tdls_dis_rsp(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, u8 privacy)\r
{\r
struct xmit_frame *pmgntframe;\r
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);\r
int ret = _FAIL;\r
\r
+ DBG_871X("[TDLS] %s\n", __FUNCTION__);\r
+\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
\r
- //update attribute\r
pattrib = &pmgntframe->attrib;\r
update_mgntframe_attrib(padapter, pattrib);\r
\r
fctrl = &(pwlanhdr->frame_ctl);\r
*(fctrl) = 0;\r
\r
- // unicast probe request frame\r
+ /* unicast probe request frame */\r
_rtw_memcpy(pwlanhdr->addr1, ptxmgmt->peer, ETH_ALEN);\r
_rtw_memcpy(pattrib->dst, pwlanhdr->addr1, ETH_ALEN);\r
- _rtw_memcpy(pwlanhdr->addr2, myid(&padapter->eeprompriv), ETH_ALEN);\r
+ _rtw_memcpy(pwlanhdr->addr2, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->src, pwlanhdr->addr2, ETH_ALEN);\r
_rtw_memcpy(pwlanhdr->addr3, get_bssid(&padapter->mlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, pwlanhdr->addr3, ETH_ALEN);\r
- \r
+\r
SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);\r
pmlmeext->mgnt_seq++;\r
SetFrameSubType(pframe, WIFI_ACTION);\r
pframe += sizeof (struct rtw_ieee80211_hdr_3addr);\r
pattrib->pktlen = sizeof (struct rtw_ieee80211_hdr_3addr);\r
\r
- rtw_build_tdls_dis_rsp_ies(padapter, pmgntframe, pframe, ptxmgmt->dialog_token, privacy);\r
+ rtw_build_tdls_dis_rsp_ies(padapter, pmgntframe, pframe, ptxmgmt, privacy);\r
\r
pattrib->nr_frags = 1;\r
pattrib->last_txcmdsz = pattrib->pktlen;\r
return ret;\r
}\r
\r
-int issue_tdls_peer_traffic_rsp(_adapter *padapter, struct sta_info *ptdls_sta)\r
+int issue_tdls_peer_traffic_rsp(_adapter *padapter, struct sta_info *ptdls_sta, struct tdls_txmgmt *ptxmgmt)\r
{\r
struct xmit_frame *pmgntframe;\r
struct pkt_attrib *pattrib;\r
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;\r
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);\r
- struct tdls_txmgmt txmgmt;\r
int ret = _FAIL;\r
\r
- _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
- txmgmt.action_code = TDLS_PEER_TRAFFIC_RESPONSE;\r
+ DBG_871X("[TDLS] %s\n", __FUNCTION__);\r
+\r
+ ptxmgmt->action_code = TDLS_PEER_TRAFFIC_RESPONSE;\r
\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
- \r
- //update attribute\r
+\r
pattrib = &pmgntframe->attrib;\r
\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
_rtw_memcpy(pattrib->dst, ptdls_sta->hwaddr, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
update_tdls_attrib(padapter, pattrib);\r
pattrib->qsel = pattrib->priority;\r
\r
- if(rtw_xmit_tdls_coalesce(padapter, pmgntframe, &txmgmt) !=_SUCCESS ){\r
+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, ptxmgmt) !=_SUCCESS) {\r
rtw_free_xmitbuf(pxmitpriv,pmgntframe->pxmitbuf);\r
rtw_free_xmitframe(pxmitpriv, pmgntframe);\r
goto exit; \r
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);\r
struct tdls_txmgmt txmgmt;\r
int ret = _FAIL;\r
- static u8 dialogtoken=0;\r
+\r
+ DBG_871X("[TDLS] %s\n", __FUNCTION__);\r
\r
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
txmgmt.action_code = TDLS_PEER_TRAFFIC_INDICATION;\r
\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
- \r
- //update attribute\r
+\r
pattrib = &pmgntframe->attrib;\r
\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
_rtw_memcpy(pattrib->dst, ptdls_sta->hwaddr, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
- //for tdls; pattrib->nr_frags is used to fill dialogtoken\r
- ptdls_sta->dialog = dialogtoken;\r
- dialogtoken = (dialogtoken+1)%256;\r
- //PTI frame's priority should be AC_VO\r
+ /* PTI frame's priority should be AC_VO */\r
pattrib->priority = 7; \r
\r
update_tdls_attrib(padapter, pattrib);\r
return ret;\r
}\r
\r
-int issue_tdls_ch_switch_req(_adapter *padapter, u8 *mac_addr)\r
+int issue_tdls_ch_switch_req(_adapter *padapter, struct sta_info *ptdls_sta)\r
{\r
struct xmit_frame *pmgntframe;\r
struct pkt_attrib *pattrib;\r
struct tdls_txmgmt txmgmt;\r
int ret = _FAIL;\r
\r
+ DBG_871X("[TDLS] %s\n", __FUNCTION__);\r
+\r
+ if (padapter->tdlsinfo.ch_switch_prohibited == _TRUE)\r
+ { DBG_871X("[TDLS] Ignore %s since ch_switch_prohibited = _TRUE\n", __FUNCTION__);\r
+ goto exit;\r
+ }\r
+\r
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
txmgmt.action_code = TDLS_CHANNEL_SWITCH_REQUEST;\r
\r
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
goto exit;\r
- }\r
- \r
- //update attribute\r
+\r
pattrib = &pmgntframe->attrib;\r
\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
- _rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->dst, ptdls_sta->hwaddr, ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
update_tdls_attrib(padapter, pattrib);\r
pattrib->qsel = pattrib->priority;\r
- if(rtw_xmit_tdls_coalesce(padapter, pmgntframe, &txmgmt) !=_SUCCESS ){\r
+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, &txmgmt) !=_SUCCESS) {\r
rtw_free_xmitbuf(pxmitpriv,pmgntframe->pxmitbuf);\r
rtw_free_xmitframe(pxmitpriv, pmgntframe);\r
goto exit;\r
return ret;\r
}\r
\r
-int issue_tdls_ch_switch_rsp(_adapter *padapter, u8 *mac_addr)\r
+int issue_tdls_ch_switch_rsp(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, int wait_ack)\r
{\r
struct xmit_frame *pmgntframe;\r
struct pkt_attrib *pattrib;\r
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;\r
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);\r
- struct tdls_txmgmt txmgmt;\r
int ret = _FAIL;\r
\r
- _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
- txmgmt.action_code = TDLS_CHANNEL_SWITCH_RESPONSE;\r
+ DBG_871X("[TDLS] %s\n", __FUNCTION__);\r
\r
- if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
- {\r
+ if (padapter->tdlsinfo.ch_switch_prohibited == _TRUE)\r
+ { DBG_871X("[TDLS] Ignore %s since ch_switch_prohibited = _TRUE\n", __FUNCTION__);\r
goto exit;\r
}\r
- \r
- //update attribute\r
+\r
+ ptxmgmt->action_code = TDLS_CHANNEL_SWITCH_RESPONSE;\r
+\r
+ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)\r
+ goto exit;\r
+\r
pattrib = &pmgntframe->attrib;\r
\r
pmgntframe->frame_tag = DATA_FRAMETAG;\r
pattrib->ether_type = 0x890d;\r
\r
- _rtw_memcpy(pattrib->dst, mac_addr, ETH_ALEN);\r
- _rtw_memcpy(pattrib->src, myid(&(padapter->eeprompriv)), ETH_ALEN);\r
+ _rtw_memcpy(pattrib->dst, ptxmgmt->peer, ETH_ALEN);\r
+ _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN);\r
_rtw_memcpy(pattrib->ra, get_bssid(pmlmepriv), ETH_ALEN);\r
_rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN);\r
\r
return _FALSE;\r
}\r
*/\r
- if(rtw_xmit_tdls_coalesce(padapter, pmgntframe, &txmgmt) !=_SUCCESS ){\r
+ if (rtw_xmit_tdls_coalesce(padapter, pmgntframe, ptxmgmt) !=_SUCCESS) {\r
rtw_free_xmitbuf(pxmitpriv,pmgntframe->pxmitbuf);\r
rtw_free_xmitframe(pxmitpriv, pmgntframe);\r
- goto exit; \r
+ goto exit;\r
+ }\r
+\r
+ if (wait_ack) {\r
+ ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe);\r
+ } else {\r
+ dump_mgntframe(padapter, pmgntframe);\r
+ ret = _SUCCESS;\r
}\r
- dump_mgntframe(padapter, pmgntframe);\r
ret = _SUCCESS;\r
exit:\r
\r
int ret = _SUCCESS;\r
\r
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
- //WFDTDLS: for sigma test, not to setup direct link automatically\r
- ptdlsinfo->dev_discovered = 1;\r
+ /* WFDTDLS: for sigma test, not to setup direct link automatically */\r
+ ptdlsinfo->dev_discovered = _TRUE;\r
\r
#ifdef CONFIG_TDLS_AUTOSETUP\r
+\r
psa = get_sa(ptr);\r
ptdls_sta = rtw_get_stainfo(&(padapter->stapriv), psa);\r
\r
- if(ptdls_sta != NULL)\r
- {\r
+ if (ptdls_sta != NULL) {\r
ptdls_sta->tdls_sta_state |= TDLS_ALIVE_STATE;\r
\r
- //Record the tdls sta with lowest signal strength\r
- if( (ptdlsinfo->sta_maximum == _TRUE) && (ptdls_sta->alive_count >= 1) )\r
- {\r
- if( _rtw_memcmp(ptdlsinfo->ss_record.macaddr, empty_addr, ETH_ALEN) )\r
- {\r
+ /* Record the tdls sta with lowest signal strength */\r
+ if (ptdlsinfo->sta_maximum == _TRUE && ptdls_sta->alive_count >= 1 ) {\r
+ if (_rtw_memcmp(ptdlsinfo->ss_record.macaddr, empty_addr, ETH_ALEN)) {\r
_rtw_memcpy(ptdlsinfo->ss_record.macaddr, psa, ETH_ALEN);\r
- ptdlsinfo->ss_record.RxPWDBAll = pattrib->RxPWDBAll;\r
- }\r
- else\r
- {\r
- if( ptdlsinfo->ss_record.RxPWDBAll < pattrib->RxPWDBAll )\r
- {\r
+ ptdlsinfo->ss_record.RxPWDBAll = pattrib->phy_info.RxPWDBAll;\r
+ } else {\r
+ if (ptdlsinfo->ss_record.RxPWDBAll < pattrib->phy_info.RxPWDBAll) {\r
_rtw_memcpy(ptdlsinfo->ss_record.macaddr, psa, ETH_ALEN);\r
- ptdlsinfo->ss_record.RxPWDBAll = pattrib->RxPWDBAll;\r
+ ptdlsinfo->ss_record.RxPWDBAll = pattrib->phy_info.RxPWDBAll;\r
}\r
}\r
}\r
-\r
- }\r
- else\r
- {\r
- if( ptdlsinfo->sta_maximum == _TRUE)\r
- {\r
- if( _rtw_memcmp( ptdlsinfo->ss_record.macaddr, empty_addr, ETH_ALEN ) )\r
- {\r
- //All traffics are busy, do not set up another direct link.\r
+ } else {\r
+ if (ptdlsinfo->sta_maximum == _TRUE) {\r
+ if (_rtw_memcmp( ptdlsinfo->ss_record.macaddr, empty_addr, ETH_ALEN)) {\r
+ /* All traffics are busy, do not set up another direct link. */\r
ret = _FAIL;\r
goto exit;\r
- }\r
- else\r
- {\r
- if( pattrib->RxPWDBAll > ptdlsinfo->ss_record.RxPWDBAll )\r
- {\r
+ } else {\r
+ if (pattrib->phy_info.RxPWDBAll > ptdlsinfo->ss_record.RxPWDBAll) {\r
_rtw_memcpy(txmgmt.peer, ptdlsinfo->ss_record.macaddr, ETH_ALEN);\r
- //issue_tdls_teardown(padapter, ptdlsinfo->ss_record.macaddr, _FALSE);\r
- }\r
- else\r
- {\r
+ /* issue_tdls_teardown(padapter, ptdlsinfo->ss_record.macaddr, _FALSE); */\r
+ } else {\r
ret = _FAIL;\r
goto exit;\r
}\r
}\r
}\r
\r
- padapter->HalFunc.GetHalDefVarHandler(padapter, HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, &UndecoratedSmoothedPWDB);\r
+ rtw_hal_get_def_var(padapter, HAL_DEF_UNDERCORATEDSMOOTHEDPWDB, &UndecoratedSmoothedPWDB);\r
\r
- if( pattrib->RxPWDBAll + TDLS_SIGNAL_THRESH >= UndecoratedSmoothedPWDB);\r
- {\r
- DBG_871X("pattrib->RxPWDBAll=%d, pdmpriv->UndecoratedSmoothedPWDB=%d\n", pattrib->RxPWDBAll, UndecoratedSmoothedPWDB);\r
+ if (pattrib->phy_info.RxPWDBAll + TDLS_SIGNAL_THRESH >= UndecoratedSmoothedPWDB) {\r
+ DBG_871X("pattrib->RxPWDBAll=%d, pdmpriv->UndecoratedSmoothedPWDB=%d\n", pattrib->phy_info.RxPWDBAll, UndecoratedSmoothedPWDB);\r
_rtw_memcpy(txmgmt.peer, psa, ETH_ALEN);\r
issue_tdls_setup_req(padapter, &txmgmt, _FALSE);\r
}\r
}\r
-#endif //CONFIG_TDLS_AUTOSETUP\r
+#endif /* CONFIG_TDLS_AUTOSETUP */\r
\r
exit:\r
return ret;\r
u8 ccmp_included=0, rsnie_included=0;\r
u16 j, pairwise_count;\r
u8 SNonce[32];\r
- u32 *timeout_interval=NULL;\r
- sint parsing_length; //frame body length, without icv_len\r
+ u32 timeout_interval = TPK_RESEND_COUNT;\r
+ sint parsing_length; /* Frame body length, without icv_len */\r
PNDIS_802_11_VARIABLE_IEs pIE;\r
u8 FIXED_IE = 5;\r
unsigned char supportRate[16];\r
int supportRateNum = 0;\r
struct tdls_txmgmt txmgmt;\r
\r
+ if (ptdlsinfo->ap_prohibited == _TRUE)\r
+ goto exit;\r
+\r
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
psa = get_sa(ptr);\r
ptdls_sta = rtw_get_stainfo(pstapriv, psa);\r
\r
- pmyid=myid(&(padapter->eeprompriv));\r
- ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE+1;\r
+ pmyid = adapter_mac_addr(padapter);\r
+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+ETH_TYPE_LEN+PAYLOAD_TYPE_LEN;\r
parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len\r
-prx_pkt_attrib->hdrlen\r
-prx_pkt_attrib->iv_len\r
-PAYLOAD_TYPE_LEN\r
-FIXED_IE;\r
\r
- if(ptdlsinfo->ap_prohibited == _TRUE)\r
- {\r
- goto exit;\r
- }\r
-\r
- if(ptdls_sta==NULL){\r
+ if (ptdls_sta == NULL) {\r
ptdls_sta = rtw_alloc_stainfo(pstapriv, psa);\r
- }else{\r
- if(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE){\r
- //If the direct link is already set up\r
- //Process as re-setup after tear down\r
+ } else {\r
+ if (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) {\r
+ /* If the direct link is already set up */\r
+ /* Process as re-setup after tear down */\r
DBG_871X("re-setup a direct link\n");\r
}\r
- //already receiving TDLS setup request\r
- else if(ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){\r
+ /* Already receiving TDLS setup request */\r
+ else if (ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE) {\r
DBG_871X("receive duplicated TDLS setup request frame in handshaking\n");\r
goto exit;\r
}\r
- //When receiving and sending setup_req to the same link at the same time, STA with higher MAC_addr would be initiator\r
- //following is to check out MAC_addr\r
- else if(ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){\r
+ /* When receiving and sending setup_req to the same link at the same time */\r
+ /* STA with higher MAC_addr would be initiator */\r
+ else if (ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE) {\r
DBG_871X("receive setup_req after sending setup_req\n");\r
for (i=0;i<6;i++){\r
if(*(pmyid+i)==*(psa+i)){\r
}\r
else if(*(pmyid+i)>*(psa+i)){\r
- ptdls_sta->tdls_sta_state=TDLS_INITIATOR_STATE;\r
+ ptdls_sta->tdls_sta_state = TDLS_INITIATOR_STATE;\r
break;\r
}else if(*(pmyid+i)<*(psa+i)){\r
goto exit;\r
}\r
}\r
\r
- if(ptdls_sta) \r
- {\r
- ptdls_sta->dialog = *(ptr+2); //copy dialog token\r
- ptdls_sta->stat_code = 0;\r
+ if (ptdls_sta) {\r
+ txmgmt.dialog_token = *(ptr+2); /* Copy dialog token */\r
+ txmgmt.status_code = _STATS_SUCCESSFUL_;\r
\r
- //parsing information element\r
- for(j=FIXED_IE; j<parsing_length;){\r
+ /* Parsing information element */\r
+ for (j=FIXED_IE; j<parsing_length;) {\r
\r
pIE = (PNDIS_802_11_VARIABLE_IEs)(ptr+ j);\r
\r
- switch (pIE->ElementID)\r
- {\r
- case _SUPPORTEDRATES_IE_:\r
- _rtw_memcpy(supportRate, pIE->data, pIE->Length);\r
- supportRateNum = pIE->Length;\r
- break;\r
- case _COUNTRY_IE_:\r
- break;\r
- case _EXT_SUPPORTEDRATES_IE_:\r
- if(supportRateNum<=sizeof(supportRate))\r
- {\r
- _rtw_memcpy(supportRate+supportRateNum, pIE->data, pIE->Length);\r
- supportRateNum += pIE->Length;\r
- }\r
- break;\r
- case _SUPPORTED_CH_IE_:\r
- break;\r
- case _RSN_IE_2_:\r
- rsnie_included=1;\r
- if(prx_pkt_attrib->encrypt){\r
- prsnie=(u8*)pIE;\r
- //check whether initiator STA has CCMP pairwise_cipher.\r
- ppairwise_cipher=prsnie+10;\r
- _rtw_memcpy(ptdls_sta->TDLS_RSNIE, pIE->data, pIE->Length);\r
- pairwise_count = *(u16*)(ppairwise_cipher-2);\r
- for(k=0;k<pairwise_count;k++){\r
- if(_rtw_memcmp( ppairwise_cipher+4*k, RSN_CIPHER_SUITE_CCMP, 4)==_TRUE)\r
- ccmp_included=1;\r
- }\r
- if(ccmp_included==0){\r
- //invalid contents of RSNIE\r
- ptdls_sta->stat_code=72;\r
- }\r
- }\r
- break;\r
- case _EXT_CAP_IE_:\r
- break;\r
- case _VENDOR_SPECIFIC_IE_:\r
- break;\r
- case _FTIE_:\r
- if(prx_pkt_attrib->encrypt)\r
- _rtw_memcpy(SNonce, (ptr+j+52), 32);\r
- break;\r
- case _TIMEOUT_ITVL_IE_:\r
- if(prx_pkt_attrib->encrypt)\r
- timeout_interval = (u32 *)(ptr+j+3);\r
- break;\r
- case _RIC_Descriptor_IE_:\r
- break;\r
- case _HT_CAPABILITY_IE_:\r
- rtw_tdls_process_ht_cap(padapter, ptdls_sta, pIE->data, pIE->Length);\r
- break;\r
- case EID_BSSCoexistence:\r
- break;\r
- case _LINK_ID_IE_:\r
- if(_rtw_memcmp(get_bssid(pmlmepriv), pIE->data, 6) == _FALSE)\r
- {\r
- //not in the same BSS\r
- ptdls_sta->stat_code=7;\r
+ switch (pIE->ElementID) {\r
+ case _SUPPORTEDRATES_IE_:\r
+ _rtw_memcpy(supportRate, pIE->data, pIE->Length);\r
+ supportRateNum = pIE->Length;\r
+ break;\r
+ case _COUNTRY_IE_:\r
+ break;\r
+ case _EXT_SUPPORTEDRATES_IE_:\r
+ if (supportRateNum<=sizeof(supportRate)) {\r
+ _rtw_memcpy(supportRate+supportRateNum, pIE->data, pIE->Length);\r
+ supportRateNum += pIE->Length;\r
+ }\r
+ break;\r
+ case _SUPPORTED_CH_IE_:\r
+ break;\r
+ case _RSN_IE_2_:\r
+ rsnie_included=1;\r
+ if (prx_pkt_attrib->encrypt) {\r
+ prsnie=(u8*)pIE;\r
+ /* Check CCMP pairwise_cipher presence. */\r
+ ppairwise_cipher=prsnie+10;\r
+ _rtw_memcpy(ptdls_sta->TDLS_RSNIE, pIE->data, pIE->Length);\r
+ pairwise_count = *(u16*)(ppairwise_cipher-2);\r
+ for (k=0; k<pairwise_count; k++) {\r
+ if (_rtw_memcmp( ppairwise_cipher+4*k, RSN_CIPHER_SUITE_CCMP, 4)==_TRUE)\r
+ ccmp_included=1;\r
}\r
- break;\r
- default:\r
- break;\r
+\r
+ if (ccmp_included == 0)\r
+ txmgmt.status_code=_STATS_INVALID_RSNIE_;\r
+ }\r
+ break;\r
+ case _EXT_CAP_IE_:\r
+ break;\r
+ case _VENDOR_SPECIFIC_IE_:\r
+ break;\r
+ case _FTIE_:\r
+ if (prx_pkt_attrib->encrypt)\r
+ _rtw_memcpy(SNonce, (ptr+j+52), 32);\r
+ break;\r
+ case _TIMEOUT_ITVL_IE_:\r
+ if (prx_pkt_attrib->encrypt)\r
+ timeout_interval = cpu_to_le32(*(u32*)(ptr+j+3));\r
+ break;\r
+ case _RIC_Descriptor_IE_:\r
+ break;\r
+ case _HT_CAPABILITY_IE_:\r
+ rtw_tdls_process_ht_cap(padapter, ptdls_sta, pIE->data, pIE->Length);\r
+ break;\r
+ case EID_BSSCoexistence:\r
+ break;\r
+ case _LINK_ID_IE_:\r
+ if (_rtw_memcmp(get_bssid(pmlmepriv), pIE->data, 6) == _FALSE)\r
+ txmgmt.status_code=_STATS_NOT_IN_SAME_BSS_;\r
+ break;\r
+ default:\r
+ break;\r
}\r
\r
j += (pIE->Length + 2);\r
\r
}\r
\r
- //check status code\r
- //if responder STA has/hasn't security on AP, but request hasn't/has RSNIE, it should reject\r
- if(ptdls_sta->stat_code == 0 )\r
- {\r
- if(rsnie_included && (prx_pkt_attrib->encrypt==0)){\r
- //security disabled\r
- ptdls_sta->stat_code = 5;\r
- }else if(rsnie_included==0 && (prx_pkt_attrib->encrypt)){\r
- //request haven't RSNIE\r
- ptdls_sta->stat_code = 38;\r
- }\r
+ /* Check status code */\r
+ /* If responder STA has/hasn't security on AP, but request hasn't/has RSNIE, it should reject */\r
+ if (txmgmt.status_code == _STATS_SUCCESSFUL_) {\r
+ if (rsnie_included && prx_pkt_attrib->encrypt == 0)\r
+ txmgmt.status_code = _STATS_SEC_DISABLED_;\r
+ else if (rsnie_included==0 && prx_pkt_attrib->encrypt)\r
+ txmgmt.status_code = _STATS_INVALID_PARAMETERS_;\r
\r
#ifdef CONFIG_WFD\r
- //WFD test plan version 0.18.2 test item 5.1.5\r
- //SoUT does not use TDLS if AP uses weak security\r
- if ( padapter->wdinfo.wfd_tdls_enable )\r
- {\r
- if(rsnie_included && (prx_pkt_attrib->encrypt != _AES_))\r
- {\r
- ptdls_sta->stat_code = 5;\r
- }\r
- }\r
-#endif //CONFIG_WFD\r
+ /* WFD test plan version 0.18.2 test item 5.1.5 */\r
+ /* SoUT does not use TDLS if AP uses weak security */\r
+ if (padapter->wdinfo.wfd_tdls_enable && (rsnie_included && prx_pkt_attrib->encrypt != _AES_))\r
+ txmgmt.status_code = _STATS_SEC_DISABLED_;\r
+#endif /* CONFIG_WFD */\r
}\r
\r
ptdls_sta->tdls_sta_state|= TDLS_INITIATOR_STATE;\r
- if(prx_pkt_attrib->encrypt){\r
+ if (prx_pkt_attrib->encrypt) {\r
_rtw_memcpy(ptdls_sta->SNonce, SNonce, 32);\r
- _rtw_memcpy(&(ptdls_sta->TDLS_PeerKey_Lifetime), timeout_interval, 4);\r
+\r
+ if (timeout_interval <= 300) \r
+ ptdls_sta->TDLS_PeerKey_Lifetime = TPK_RESEND_COUNT;\r
+ else\r
+ ptdls_sta->TDLS_PeerKey_Lifetime = timeout_interval;\r
}\r
\r
- //update station supportRate \r
+ /* Update station supportRate */\r
ptdls_sta->bssratelen = supportRateNum;\r
_rtw_memcpy(ptdls_sta->bssrateset, supportRate, supportRateNum);\r
\r
- if(!(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE))\r
+ if (!(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE))\r
ptdlsinfo->sta_cnt++;\r
- if( ptdlsinfo->sta_cnt == (NUM_STA - 2 - 4) ) // -2: AP + BC/MC sta, -4: default key\r
- {\r
+ /* -2: AP + BC/MC sta, -4: default key */\r
+ if (ptdlsinfo->sta_cnt == MAX_ALLOWED_TDLS_STA_NUM)\r
ptdlsinfo->sta_maximum = _TRUE;\r
- }\r
\r
#ifdef CONFIG_WFD\r
rtw_tdls_process_wfd_ie(ptdlsinfo, ptr + FIXED_IE, parsing_length - FIXED_IE);\r
-#endif // CONFIG_WFD\r
+#endif /* CONFIG_WFD */\r
\r
- }\r
- else\r
- {\r
+ }else {\r
goto exit;\r
}\r
\r
_rtw_memcpy(txmgmt.peer, prx_pkt_attrib->src, ETH_ALEN);\r
- issue_tdls_setup_rsp(padapter, &txmgmt);\r
\r
- if(ptdls_sta->stat_code==0)\r
- {\r
- _set_timer( &ptdls_sta->handshake_timer, TDLS_HANDSHAKE_TIME);\r
- }\r
- else //status code!=0 ; setup unsuccess\r
- {\r
- free_tdls_sta(padapter, ptdls_sta);\r
+ if (rtw_tdls_is_driver_setup(padapter)) {\r
+ issue_tdls_setup_rsp(padapter, &txmgmt);\r
+\r
+ if (txmgmt.status_code==_STATS_SUCCESSFUL_) {\r
+ _set_timer( &ptdls_sta->handshake_timer, TDLS_HANDSHAKE_TIME);\r
+ }else {\r
+ free_tdls_sta(padapter, ptdls_sta);\r
+ }\r
}\r
\r
exit:\r
\r
int On_TDLS_Setup_Rsp(_adapter *padapter, union recv_frame *precv_frame)\r
{\r
+ struct registry_priv *pregistrypriv = &padapter->registrypriv;\r
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;\r
struct sta_info *ptdls_sta= NULL;\r
struct sta_priv *pstapriv = &padapter->stapriv;\r
_irqL irqL;\r
struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib;\r
u8 *psa;\r
- u16 stat_code;\r
- sint parsing_length; //frame body length, without icv_len\r
+ u16 status_code=0;\r
+ sint parsing_length; /* Frame body length, without icv_len */\r
PNDIS_802_11_VARIABLE_IEs pIE;\r
u8 FIXED_IE =7;\r
u8 ANonce[32];\r
int supportRateNum = 0;\r
struct tdls_txmgmt txmgmt;\r
int ret = _SUCCESS;\r
+ u32 timeout_interval = TPK_RESEND_COUNT;\r
\r
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
psa = get_sa(ptr);\r
ptdls_sta = rtw_get_stainfo(pstapriv, psa);\r
\r
- if ( NULL == ptdls_sta )\r
- {\r
+ if (NULL == ptdls_sta) {\r
ret = _FAIL;\r
goto exit;\r
}\r
\r
- ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE+1;\r
+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+ETH_TYPE_LEN+PAYLOAD_TYPE_LEN;\r
parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len\r
-prx_pkt_attrib->hdrlen\r
-prx_pkt_attrib->iv_len\r
-prx_pkt_attrib->icv_len\r
-LLC_HEADER_SIZE\r
- -TYPE_LENGTH_FIELD_SIZE\r
- -1\r
+ -ETH_TYPE_LEN\r
+ -PAYLOAD_TYPE_LEN\r
-FIXED_IE;\r
\r
- _rtw_memcpy(&stat_code, ptr+2, 2);\r
+ _rtw_memcpy(&status_code, ptr+2, 2);\r
\r
- if(stat_code!=0)\r
- {\r
- DBG_871X( "[%s] status_code = %d, free_tdls_sta\n", __FUNCTION__, stat_code );\r
+ if (status_code != 0) {\r
+ DBG_871X( "[TDLS] %s status_code = %d, free_tdls_sta\n", __FUNCTION__, status_code );\r
free_tdls_sta(padapter, ptdls_sta);\r
ret = _FAIL;\r
goto exit;\r
}\r
\r
- stat_code = 0;\r
+ status_code = 0;\r
\r
- //parsing information element\r
- for(j=FIXED_IE; j<parsing_length;)\r
- {\r
+ /* parsing information element */\r
+ for (j = FIXED_IE; j<parsing_length;) {\r
pIE = (PNDIS_802_11_VARIABLE_IEs)(ptr+ j);\r
\r
- switch (pIE->ElementID)\r
- {\r
- case _SUPPORTEDRATES_IE_:\r
- _rtw_memcpy(supportRate, pIE->data, pIE->Length);\r
- supportRateNum = pIE->Length;\r
- break;\r
- case _COUNTRY_IE_:\r
- break;\r
- case _EXT_SUPPORTEDRATES_IE_:\r
- if(supportRateNum<=sizeof(supportRate))\r
- {\r
- _rtw_memcpy(supportRate+supportRateNum, pIE->data, pIE->Length);\r
- supportRateNum += pIE->Length;\r
- }\r
- break;\r
- case _SUPPORTED_CH_IE_:\r
- break;\r
- case _RSN_IE_2_:\r
- prsnie=(u8*)pIE;\r
- //check whether responder STA has CCMP pairwise_cipher.\r
- ppairwise_cipher=prsnie+10;\r
- _rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 2);\r
- for(k=0;k<pairwise_count;k++){\r
- if(_rtw_memcmp( ppairwise_cipher+4*k, RSN_CIPHER_SUITE_CCMP, 4)==_TRUE)\r
- verify_ccmp=1;\r
- }\r
- case _EXT_CAP_IE_:\r
- break;\r
- case _VENDOR_SPECIFIC_IE_:\r
- break;\r
- case _FTIE_:\r
- pftie=(u8*)pIE;\r
- //_rtw_memcpy(ptdls_sta->ANonce, (ptr+j+20), 32);\r
- _rtw_memcpy(ANonce, (ptr+j+20), 32);\r
- break;\r
- case _TIMEOUT_ITVL_IE_:\r
- ptimeout_ie=(u8*)pIE;\r
- break;\r
- case _RIC_Descriptor_IE_:\r
- break;\r
- case _HT_CAPABILITY_IE_:\r
- rtw_tdls_process_ht_cap(padapter, ptdls_sta, pIE->data, pIE->Length);\r
- break;\r
- case EID_BSSCoexistence:\r
- break;\r
- case _LINK_ID_IE_:\r
- plinkid_ie=(u8*)pIE;\r
- break;\r
- default:\r
- break;\r
+ switch (pIE->ElementID) {\r
+ case _SUPPORTEDRATES_IE_:\r
+ _rtw_memcpy(supportRate, pIE->data, pIE->Length);\r
+ supportRateNum = pIE->Length;\r
+ break;\r
+ case _COUNTRY_IE_:\r
+ break;\r
+ case _EXT_SUPPORTEDRATES_IE_:\r
+ if (supportRateNum<=sizeof(supportRate)) {\r
+ _rtw_memcpy(supportRate+supportRateNum, pIE->data, pIE->Length);\r
+ supportRateNum += pIE->Length;\r
+ }\r
+ break;\r
+ case _SUPPORTED_CH_IE_:\r
+ break;\r
+ case _RSN_IE_2_:\r
+ prsnie=(u8*)pIE;\r
+ /* Check CCMP pairwise_cipher presence. */\r
+ ppairwise_cipher=prsnie+10;\r
+ _rtw_memcpy(&pairwise_count, (u16*)(ppairwise_cipher-2), 2);\r
+ for (k=0;k<pairwise_count;k++) {\r
+ if (_rtw_memcmp( ppairwise_cipher+4*k, RSN_CIPHER_SUITE_CCMP, 4) == _TRUE)\r
+ verify_ccmp=1;\r
+ }\r
+ case _EXT_CAP_IE_:\r
+ break;\r
+ case _VENDOR_SPECIFIC_IE_:\r
+ if (_rtw_memcmp((u8 *)pIE + 2, WMM_INFO_OUI, 6) == _TRUE) { \r
+ /* WMM Info ID and OUI */\r
+ if ((pregistrypriv->wmm_enable == _TRUE) || (padapter->mlmepriv.htpriv.ht_option == _TRUE))\r
+ ptdls_sta->qos_option = _TRUE;\r
+ }\r
+ break;\r
+ case _FTIE_:\r
+ pftie=(u8*)pIE;\r
+ _rtw_memcpy(ANonce, (ptr+j+20), 32);\r
+ break;\r
+ case _TIMEOUT_ITVL_IE_:\r
+ ptimeout_ie=(u8*)pIE;\r
+ timeout_interval = cpu_to_le32(*(u32*)(ptimeout_ie+3));\r
+ break;\r
+ case _RIC_Descriptor_IE_:\r
+ break;\r
+ case _HT_CAPABILITY_IE_:\r
+ rtw_tdls_process_ht_cap(padapter, ptdls_sta, pIE->data, pIE->Length);\r
+ break;\r
+ case EID_BSSCoexistence:\r
+ break;\r
+ case _LINK_ID_IE_:\r
+ plinkid_ie=(u8*)pIE;\r
+ break;\r
+ default:\r
+ break;\r
}\r
\r
j += (pIE->Length + 2);\r
- \r
+\r
}\r
\r
- //update station's supportRate \r
ptdls_sta->bssratelen = supportRateNum;\r
_rtw_memcpy(ptdls_sta->bssrateset, supportRate, supportRateNum);\r
-\r
_rtw_memcpy(ptdls_sta->ANonce, ANonce, 32);\r
\r
#ifdef CONFIG_WFD\r
rtw_tdls_process_wfd_ie(ptdlsinfo, ptr + FIXED_IE, parsing_length - FIXED_IE);\r
-#endif // CONFIG_WFD\r
+#endif /* CONFIG_WFD */\r
\r
- if(stat_code != 0)\r
- {\r
- ptdls_sta->stat_code = stat_code;\r
- }\r
- else\r
- {\r
- if(prx_pkt_attrib->encrypt)\r
- {\r
- if(verify_ccmp==1)\r
- {\r
- wpa_tdls_generate_tpk(padapter, ptdls_sta);\r
- ptdls_sta->stat_code=0;\r
- if(tdls_verify_mic(ptdls_sta->tpk.kck, 2, plinkid_ie, prsnie, ptimeout_ie, pftie)==0) //0: Invalid, 1: valid\r
- {\r
- free_tdls_sta(padapter, ptdls_sta);\r
- ret = _FAIL;\r
- goto exit;\r
+ if (status_code != _STATS_SUCCESSFUL_) {\r
+ txmgmt.status_code = status_code;\r
+ } else {\r
+ if (prx_pkt_attrib->encrypt) {\r
+ if (verify_ccmp == 1) {\r
+ txmgmt.status_code = _STATS_SUCCESSFUL_;\r
+ if (rtw_tdls_is_driver_setup(padapter) == _TRUE) {\r
+ wpa_tdls_generate_tpk(padapter, ptdls_sta);\r
+ if (tdls_verify_mic(ptdls_sta->tpk.kck, 2, plinkid_ie, prsnie, ptimeout_ie, pftie) == _FAIL) {\r
+ DBG_871X( "[TDLS] %s tdls_verify_mic fail, free_tdls_sta\n", __FUNCTION__);\r
+ free_tdls_sta(padapter, ptdls_sta);\r
+ ret = _FAIL;\r
+ goto exit;\r
+ }\r
+ ptdls_sta->TDLS_PeerKey_Lifetime = timeout_interval;\r
}\r
}\r
else\r
{\r
- ptdls_sta->stat_code=72; //invalide contents of RSNIE\r
+ txmgmt.status_code = _STATS_INVALID_RSNIE_;\r
}\r
\r
}else{\r
- ptdls_sta->stat_code=0;\r
+ txmgmt.status_code = _STATS_SUCCESSFUL_;\r
}\r
}\r
\r
- DBG_871X("issue_tdls_setup_cfm\n");\r
- _rtw_memcpy(txmgmt.peer, prx_pkt_attrib->src, ETH_ALEN);\r
- issue_tdls_setup_cfm(padapter, &txmgmt);\r
+ if (rtw_tdls_is_driver_setup(padapter) == _TRUE) {\r
+ _rtw_memcpy(txmgmt.peer, prx_pkt_attrib->src, ETH_ALEN);\r
+ issue_tdls_setup_cfm(padapter, &txmgmt);\r
\r
- if(ptdls_sta->stat_code==0)\r
- {\r
- ptdlsinfo->link_established = _TRUE;\r
+ if (txmgmt.status_code == _STATS_SUCCESSFUL_) {\r
+ ptdlsinfo->link_established = _TRUE;\r
\r
- if( ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE )\r
- {\r
- ptdls_sta->tdls_sta_state |= TDLS_LINKED_STATE;\r
- _cancel_timer_ex( &ptdls_sta->handshake_timer);\r
- }\r
+ if (ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE) {\r
+ ptdls_sta->tdls_sta_state |= TDLS_LINKED_STATE;\r
+ ptdls_sta->state |= _FW_LINKED;\r
+ _cancel_timer_ex( &ptdls_sta->handshake_timer);\r
+ }\r
\r
- rtw_tdls_set_key(padapter, prx_pkt_attrib, ptdls_sta);\r
+ if (prx_pkt_attrib->encrypt)\r
+ rtw_tdls_set_key(padapter, ptdls_sta);\r
\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_ESTABLISHED);\r
+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_ESTABLISHED);\r
\r
+ }\r
}\r
\r
exit:\r
- return ret;\r
+ if (rtw_tdls_is_driver_setup(padapter) == _TRUE)\r
+ return ret;\r
+ else\r
+ return _SUCCESS;\r
\r
}\r
\r
_irqL irqL;\r
struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib;\r
u8 *psa; \r
- u16 stat_code;\r
+ u16 status_code=0;\r
sint parsing_length;\r
PNDIS_802_11_VARIABLE_IEs pIE;\r
u8 FIXED_IE =5;\r
psa = get_sa(ptr);\r
ptdls_sta = rtw_get_stainfo(pstapriv, psa);\r
\r
- if(ptdls_sta == NULL)\r
- {\r
- DBG_871X( "[%s] Direct Link Peer = "MAC_FMT" not found\n", __FUNCTION__, MAC_ARG(psa) );\r
+ if (ptdls_sta == NULL) {\r
+ DBG_871X("[%s] Direct Link Peer = "MAC_FMT" not found\n", __FUNCTION__, MAC_ARG(psa));\r
ret = _FAIL;\r
goto exit;\r
}\r
\r
- ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE+1;\r
+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+ETH_TYPE_LEN+PAYLOAD_TYPE_LEN;\r
parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len\r
-prx_pkt_attrib->hdrlen\r
-prx_pkt_attrib->iv_len\r
-ETH_TYPE_LEN\r
-PAYLOAD_TYPE_LEN\r
-FIXED_IE;\r
- _rtw_memcpy(&stat_code, ptr+2, 2);\r
\r
- if(stat_code!=0){\r
- DBG_871X( "[%s] stat_code = %d\n, free_tdls_sta", __FUNCTION__, stat_code );\r
+ _rtw_memcpy(&status_code, ptr+2, 2);\r
+\r
+ if (status_code!= 0) {\r
+ DBG_871X("[%s] status_code = %d\n, free_tdls_sta", __FUNCTION__, status_code);\r
free_tdls_sta(padapter, ptdls_sta);\r
ret = _FAIL;\r
goto exit;\r
}\r
\r
- if(prx_pkt_attrib->encrypt){\r
- //parsing information element\r
- for(j=FIXED_IE; j<parsing_length;){\r
+ if (prx_pkt_attrib->encrypt) {\r
+ /* Parsing information element */\r
+ for(j=FIXED_IE; j<parsing_length;) {\r
\r
pIE = (PNDIS_802_11_VARIABLE_IEs)(ptr+ j);\r
\r
- switch (pIE->ElementID)\r
- {\r
- case _RSN_IE_2_:\r
- prsnie=(u8*)pIE;\r
- break;\r
- case _VENDOR_SPECIFIC_IE_:\r
- break;\r
- case _FTIE_:\r
- pftie=(u8*)pIE;\r
- break;\r
- case _TIMEOUT_ITVL_IE_:\r
- ptimeout_ie=(u8*)pIE;\r
- break;\r
- case _HT_EXTRA_INFO_IE_:\r
- break;\r
- case _LINK_ID_IE_:\r
- plinkid_ie=(u8*)pIE;\r
- break;\r
- default:\r
- break;\r
+ switch (pIE->ElementID) {\r
+ case _RSN_IE_2_:\r
+ prsnie=(u8*)pIE;\r
+ break;\r
+ case _VENDOR_SPECIFIC_IE_:\r
+ if (_rtw_memcmp((u8 *)pIE + 2, WMM_PARA_OUI, 6) == _TRUE) { \r
+ /* WMM Parameter ID and OUI */\r
+ ptdls_sta->qos_option = _TRUE;\r
+ }\r
+ break;\r
+ case _FTIE_:\r
+ pftie=(u8*)pIE;\r
+ break;\r
+ case _TIMEOUT_ITVL_IE_:\r
+ ptimeout_ie=(u8*)pIE;\r
+ break;\r
+ case _HT_EXTRA_INFO_IE_:\r
+ break;\r
+ case _LINK_ID_IE_:\r
+ plinkid_ie=(u8*)pIE;\r
+ break;\r
+ default:\r
+ break;\r
}\r
\r
j += (pIE->Length + 2);\r
\r
}\r
\r
- //verify mic in FTIE MIC field\r
- if(tdls_verify_mic(ptdls_sta->tpk.kck, 3, plinkid_ie, prsnie, ptimeout_ie, pftie)==0){ //0: Invalid, 1: Valid\r
+ /* Verify mic in FTIE MIC field */\r
+ if (rtw_tdls_is_driver_setup(padapter) &&\r
+ (tdls_verify_mic(ptdls_sta->tpk.kck, 3, plinkid_ie, prsnie, ptimeout_ie, pftie) == _FAIL)) {\r
free_tdls_sta(padapter, ptdls_sta);\r
ret = _FAIL;\r
goto exit;\r
\r
}\r
\r
- ptdlsinfo->link_established = _TRUE;\r
- if( ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE )\r
- {\r
- ptdls_sta->tdls_sta_state|=TDLS_LINKED_STATE;\r
- _cancel_timer_ex( &ptdls_sta->handshake_timer);\r
- }\r
+ if (rtw_tdls_is_driver_setup(padapter)) {\r
+ ptdlsinfo->link_established = _TRUE;\r
\r
- rtw_tdls_set_key(padapter, prx_pkt_attrib, ptdls_sta);\r
+ if (ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE) {\r
+ ptdls_sta->tdls_sta_state|=TDLS_LINKED_STATE;\r
+ ptdls_sta->state |= _FW_LINKED;\r
+ _cancel_timer_ex(&ptdls_sta->handshake_timer);\r
+ }\r
+\r
+ if (prx_pkt_attrib->encrypt) {\r
+ rtw_tdls_set_key(padapter, ptdls_sta);\r
+\r
+ /* Start TPK timer */\r
+ ptdls_sta->TPK_count = 0;\r
+ _set_timer(&ptdls_sta->TPK_timer, ONE_SEC);\r
+ }\r
\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_ESTABLISHED);\r
+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_ESTABLISHED);\r
+ }\r
\r
exit:\r
return ret;\r
struct sta_priv *pstapriv = &padapter->stapriv;\r
struct sta_info *psta_ap;\r
u8 *ptr = precv_frame->u.hdr.rx_data;\r
- sint parsing_length; //frame body length, without icv_len\r
+ sint parsing_length; /* Frame body length, without icv_len */\r
PNDIS_802_11_VARIABLE_IEs pIE;\r
u8 FIXED_IE = 3, *dst;\r
u16 j;\r
struct tdls_txmgmt txmgmt;\r
int ret = _SUCCESS;\r
\r
+ if (rtw_tdls_is_driver_setup(padapter) == _FALSE)\r
+ goto exit;\r
+\r
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
- ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE + 1;\r
+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+ETH_TYPE_LEN+PAYLOAD_TYPE_LEN;\r
txmgmt.dialog_token = *(ptr+2);\r
_rtw_memcpy(&txmgmt.peer, precv_frame->u.hdr.attrib.src, ETH_ALEN);\r
txmgmt.action_code = TDLS_DISCOVERY_RESPONSE;\r
-prx_pkt_attrib->iv_len\r
-prx_pkt_attrib->icv_len\r
-LLC_HEADER_SIZE\r
- -TYPE_LENGTH_FIELD_SIZE\r
- -1\r
+ -ETH_TYPE_LEN\r
+ -PAYLOAD_TYPE_LEN\r
-FIXED_IE;\r
\r
- //parsing information element\r
- for(j=FIXED_IE; j<parsing_length;){\r
+ /* Parsing information element */\r
+ for (j=FIXED_IE; j<parsing_length;) {\r
\r
pIE = (PNDIS_802_11_VARIABLE_IEs)(ptr+ j);\r
\r
- switch (pIE->ElementID)\r
- {\r
- case _LINK_ID_IE_:\r
- psta_ap = rtw_get_stainfo(pstapriv, pIE->data);\r
- if(psta_ap == NULL)\r
- {\r
- goto exit;\r
- }\r
- dst = pIE->data + 12;\r
- if( (MacAddr_isBcst(dst) == _FALSE) && (_rtw_memcmp(myid(&(padapter->eeprompriv)), dst, 6) == _FALSE) )\r
- {\r
- goto exit;\r
- }\r
- break;\r
- default:\r
- break;\r
+ switch (pIE->ElementID) {\r
+ case _LINK_ID_IE_:\r
+ psta_ap = rtw_get_stainfo(pstapriv, pIE->data);\r
+ if (psta_ap == NULL)\r
+ goto exit;\r
+ dst = pIE->data + 12;\r
+ if (MacAddr_isBcst(dst) == _FALSE && (_rtw_memcmp(adapter_mac_addr(padapter), dst, 6) == _FALSE))\r
+ goto exit;\r
+ break;\r
+ default:\r
+ break;\r
}\r
\r
j += (pIE->Length + 2);\r
}\r
\r
issue_tdls_dis_rsp(padapter, &txmgmt, prx_pkt_attrib->privacy);\r
-\r
+ \r
exit:\r
return ret;\r
\r
struct sta_priv *pstapriv = &padapter->stapriv;\r
struct sta_info *ptdls_sta= NULL;\r
_irqL irqL;\r
+ u8 reason;\r
+\r
+ reason = *(ptr + prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN + 2);\r
+ DBG_871X("[TDLS] %s Reason code(%d)\n", __FUNCTION__,reason);\r
\r
psa = get_sa(ptr);\r
\r
ptdls_sta = rtw_get_stainfo(pstapriv, psa);\r
- if(ptdls_sta!=NULL){\r
- if(ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE){\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CS_OFF);\r
- }\r
- free_tdls_sta(padapter, ptdls_sta);\r
+ if (ptdls_sta != NULL) {\r
+ if (rtw_tdls_is_driver_setup(padapter))\r
+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_TEAR_STA);\r
}\r
- \r
+\r
return _SUCCESS;\r
\r
}\r
\r
+#if 0\r
u8 TDLS_check_ch_state(uint state){\r
- if( (state & TDLS_CH_SWITCH_ON_STATE) &&\r
- (state & TDLS_AT_OFF_CH_STATE) &&\r
- (state & TDLS_PEER_AT_OFF_STATE) ){\r
-\r
- if(state & TDLS_PEER_SLEEP_STATE)\r
- return 2; //U-APSD + ch. switch\r
+ if (state & TDLS_CH_SWITCH_ON_STATE &&\r
+ state & TDLS_PEER_AT_OFF_STATE) {\r
+ if (state & TDLS_PEER_SLEEP_STATE)\r
+ return 2; /* U-APSD + ch. switch */\r
else\r
- return 1; //ch. switch\r
+ return 1; /* ch. switch */\r
}else\r
return 0;\r
}\r
+#endif\r
\r
int On_TDLS_Peer_Traffic_Indication(_adapter *padapter, union recv_frame *precv_frame)\r
{\r
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;\r
struct sta_info *ptdls_sta = rtw_get_stainfo(&padapter->stapriv, pattrib->src); \r
u8 *ptr = precv_frame->u.hdr.rx_data;\r
+ struct tdls_txmgmt txmgmt;\r
\r
- ptr +=pattrib->hdrlen + pattrib->iv_len + LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE + 1;\r
-\r
- if(ptdls_sta != NULL)\r
- {\r
- ptdls_sta->dialog = *(ptr+2);\r
- issue_tdls_peer_traffic_rsp(padapter, ptdls_sta);\r
+ ptr +=pattrib->hdrlen + pattrib->iv_len+LLC_HEADER_SIZE+ETH_TYPE_LEN+PAYLOAD_TYPE_LEN;\r
+ _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
\r
+ if (ptdls_sta != NULL) {\r
+ txmgmt.dialog_token = *(ptr+2);\r
+ issue_tdls_peer_traffic_rsp(padapter, ptdls_sta, &txmgmt);\r
//issue_nulldata_to_TDLS_peer_STA(padapter, ptdls_sta->hwaddr, 0, 0, 0);\r
- }\r
- else\r
- {\r
+ } else {\r
DBG_871X("from unknown sta:"MAC_FMT"\n", MAC_ARG(pattrib->src));\r
return _FAIL;\r
}\r
return _SUCCESS;\r
}\r
\r
-//we process buffered data for 1. U-APSD, 2. ch. switch, 3. U-APSD + ch. switch here\r
+/* We process buffered data for 1. U-APSD, 2. ch. switch, 3. U-APSD + ch. switch here */\r
int On_TDLS_Peer_Traffic_Rsp(_adapter *padapter, union recv_frame *precv_frame)\r
{\r
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;\r
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;\r
struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;\r
struct sta_priv *pstapriv = &padapter->stapriv;\r
- //get peer sta infomation\r
struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->src);\r
- u8 wmmps_ac=0, state=TDLS_check_ch_state(ptdls_sta->tdls_sta_state);\r
+ u8 wmmps_ac=0;\r
+ /* u8 state=TDLS_check_ch_state(ptdls_sta->tdls_sta_state); */\r
int i;\r
\r
ptdls_sta->sta_stats.rx_data_pkts++;\r
\r
ptdls_sta->tdls_sta_state &= ~(TDLS_WAIT_PTR_STATE);\r
\r
- //receive peer traffic response frame, sleeping STA wakes up\r
- //ptdls_sta->tdls_sta_state &= ~(TDLS_PEER_SLEEP_STATE);\r
- //process_wmmps_data( padapter, precv_frame);\r
-\r
- // if noticed peer STA wakes up by receiving peer traffic response\r
- // and we want to do channel swtiching, then we will transmit channel switch request first\r
- if(ptdls_sta->tdls_sta_state & TDLS_APSD_CHSW_STATE){\r
- issue_tdls_ch_switch_req(padapter, pattrib->src);\r
- ptdls_sta->tdls_sta_state &= ~(TDLS_APSD_CHSW_STATE);\r
- return _SUCCESS;\r
- }\r
-\r
- //check 4-AC queue bit\r
- if(ptdls_sta->uapsd_vo || ptdls_sta->uapsd_vi || ptdls_sta->uapsd_be || ptdls_sta->uapsd_bk)\r
+ /* Check 4-AC queue bit */\r
+ if (ptdls_sta->uapsd_vo || ptdls_sta->uapsd_vi || ptdls_sta->uapsd_be || ptdls_sta->uapsd_bk)\r
wmmps_ac=1;\r
\r
- //if it's a direct link and have buffered frame\r
- if(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE){\r
- //[TDLS] UAPSD\r
- //if(wmmps_ac && state)\r
- if(wmmps_ac && 1)\r
- {\r
+ /* If it's a direct link and have buffered frame */\r
+ if (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) {\r
+ if (wmmps_ac) {\r
_irqL irqL; \r
_list *xmitframe_plist, *xmitframe_phead;\r
struct xmit_frame *pxmitframe=NULL;\r
xmitframe_phead = get_list_head(&ptdls_sta->sleep_q);\r
xmitframe_plist = get_next(xmitframe_phead);\r
\r
- //transmit buffered frames\r
- while ((rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist)) == _FALSE)\r
- { \r
+ /* transmit buffered frames */\r
+ while (rtw_end_of_queue_search(xmitframe_phead, xmitframe_plist) == _FALSE) {\r
pxmitframe = LIST_CONTAINOR(xmitframe_plist, struct xmit_frame, list);\r
xmitframe_plist = get_next(xmitframe_plist);\r
rtw_list_delete(&pxmitframe->list);\r
\r
ptdls_sta->sleepq_len--;\r
ptdls_sta->sleepq_ac_len--;\r
- if(ptdls_sta->sleepq_len>0){\r
+ if (ptdls_sta->sleepq_len>0) {\r
pxmitframe->attrib.mdata = 1;\r
pxmitframe->attrib.eosp = 0;\r
- }else{\r
+ } else {\r
pxmitframe->attrib.mdata = 0;\r
pxmitframe->attrib.eosp = 1;\r
}\r
pxmitframe->attrib.triggered = 1;\r
\r
rtw_hal_xmitframe_enqueue(padapter, pxmitframe);\r
-\r
-\r
}\r
\r
- if(ptdls_sta->sleepq_len==0)\r
- {\r
+ if (ptdls_sta->sleepq_len==0)\r
DBG_871X("no buffered packets for tdls to xmit\n");\r
- //on U-APSD + CH. switch state, when there is no buffered date to xmit,\r
- // we should go back to base channel\r
- if(state==2){\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CS_OFF);\r
- }else if(ptdls_sta->tdls_sta_state&TDLS_SW_OFF_STATE){\r
- ptdls_sta->tdls_sta_state &= ~(TDLS_SW_OFF_STATE);\r
- ptdlsinfo->candidate_ch= pmlmeext->cur_channel;\r
- issue_tdls_ch_switch_req(padapter, pattrib->src);\r
- DBG_871X("issue tdls ch switch req back to base channel\n");\r
- }\r
- \r
- }\r
- else\r
- {\r
+ else {\r
DBG_871X("error!psta->sleepq_len=%d\n", ptdls_sta->sleepq_len);\r
- ptdls_sta->sleepq_len=0; \r
+ ptdls_sta->sleepq_len=0;\r
}\r
\r
_exit_critical_bh(&ptdls_sta->sleep_q.lock, &irqL); \r
return _SUCCESS;\r
}\r
\r
+#ifdef CONFIG_TDLS_CH_SW\r
sint On_TDLS_Ch_Switch_Req(_adapter *padapter, union recv_frame *precv_frame)\r
{\r
+ struct tdls_ch_switch *pchsw_info = &padapter->tdlsinfo.chsw_info;\r
struct sta_info *ptdls_sta= NULL;\r
struct sta_priv *pstapriv = &padapter->stapriv;\r
u8 *ptr = precv_frame->u.hdr.rx_data;\r
u8 *psa; \r
sint parsing_length;\r
PNDIS_802_11_VARIABLE_IEs pIE;\r
- u8 FIXED_IE =3;\r
+ u8 FIXED_IE = 4;\r
u16 j;\r
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;\r
+ struct tdls_txmgmt txmgmt;\r
+ u16 switch_time= CH_SWITCH_TIME * 1000, switch_timeout=CH_SWITCH_TIMEOUT * 1000;\r
\r
+ if (padapter->tdlsinfo.ch_switch_prohibited == _TRUE)\r
+ { DBG_871X("[TDLS] Ignore %s since ch_switch_prohibited = _TRUE\n", __FUNCTION__);\r
+ return _SUCCESS;\r
+ }\r
+ \r
+ _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
psa = get_sa(ptr);\r
ptdls_sta = rtw_get_stainfo(pstapriv, psa);\r
- \r
- ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE+1;\r
+\r
+ ptdls_sta->ch_switch_time=switch_time;\r
+ ptdls_sta->ch_switch_timeout=switch_timeout;\r
+\r
+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+ETH_TYPE_LEN+PAYLOAD_TYPE_LEN;\r
parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len\r
-prx_pkt_attrib->hdrlen\r
-prx_pkt_attrib->iv_len\r
-PAYLOAD_TYPE_LEN\r
-FIXED_IE;\r
\r
- ptdls_sta->off_ch = *(ptr+2);\r
- \r
- //parsing information element\r
- for(j=FIXED_IE; j<parsing_length;){\r
+ pchsw_info->off_ch_num = *(ptr + 2);\r
\r
+ if (*(ptr + 2) == 2) {\r
+ pchsw_info->off_ch_num = 11;\r
+ }\r
+\r
+ if (pchsw_info->off_ch_num != pmlmeext->cur_channel) {\r
+ pchsw_info->delay_switch_back = _FALSE;\r
+ }\r
+\r
+ /* Parsing information element */\r
+ for (j=FIXED_IE; j<parsing_length;) {\r
pIE = (PNDIS_802_11_VARIABLE_IEs)(ptr+ j);\r
\r
- switch (pIE->ElementID)\r
- {\r
- case _COUNTRY_IE_:\r
- break;\r
- case _CH_SWTICH_ANNOUNCE_:\r
- break;\r
- case _LINK_ID_IE_:\r
- break;\r
- case _CH_SWITCH_TIMING_:\r
- _rtw_memcpy(&ptdls_sta->ch_switch_time, pIE->data, 2);\r
- _rtw_memcpy(&ptdls_sta->ch_switch_timeout, pIE->data+2, 2);\r
- default:\r
- break;\r
+ switch (pIE->ElementID) {\r
+ case EID_SecondaryChnlOffset:\r
+ padapter->tdlsinfo.chsw_info.ch_offset = *(pIE->data);\r
+ break;\r
+ case _LINK_ID_IE_:\r
+ break;\r
+ case _CH_SWITCH_TIMING_:\r
+ ptdls_sta->ch_switch_time = (RTW_GET_LE16(pIE->data) >= CH_SWITCH_TIME * 1000) ?\r
+ RTW_GET_LE16(pIE->data) : CH_SWITCH_TIME * 1000;\r
+ ptdls_sta->ch_switch_timeout = (RTW_GET_LE16(pIE->data + 2) >= CH_SWITCH_TIMEOUT * 1000) ?\r
+ RTW_GET_LE16(pIE->data + 2) : CH_SWITCH_TIMEOUT * 1000;\r
+ DBG_871X("%s ch_switch_time:%d, ch_switch_timeout:%d\n"\r
+ , __FUNCTION__, RTW_GET_LE16(pIE->data), RTW_GET_LE16(pIE->data + 2));\r
+ default:\r
+ break;\r
}\r
\r
j += (pIE->Length + 2);\r
- \r
}\r
\r
- //todo: check status\r
- ptdls_sta->stat_code=0;\r
- ptdls_sta->tdls_sta_state |= TDLS_CH_SWITCH_ON_STATE;\r
-\r
- issue_nulldata(padapter, NULL, 1, 0, 0);\r
-\r
- issue_tdls_ch_switch_rsp(padapter, psa);\r
+ /* Todo: check status */\r
+ txmgmt.status_code = 0;\r
+ _rtw_memcpy(txmgmt.peer, psa, ETH_ALEN);\r
+ \r
+ ATOMIC_SET(&pchsw_info->chsw_on, _TRUE);\r
\r
- DBG_871X("issue tdls channel switch response\n");\r
+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CH_SW_RESP);\r
\r
- if((ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE) && ptdls_sta->off_ch==pmlmeext->cur_channel){\r
- DBG_871X("back to base channel %x\n", pmlmeext->cur_channel);\r
- ptdls_sta->option=TDLS_BASE_CH;\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_BASE_CH);\r
- }else{ \r
- ptdls_sta->option=TDLS_OFF_CH;\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_OFF_CH);\r
- }\r
return _SUCCESS;\r
}\r
\r
sint On_TDLS_Ch_Switch_Rsp(_adapter *padapter, union recv_frame *precv_frame)\r
{\r
+ struct tdls_ch_switch *pchsw_info = &padapter->tdlsinfo.chsw_info;\r
struct sta_info *ptdls_sta= NULL;\r
struct sta_priv *pstapriv = &padapter->stapriv;\r
u8 *ptr = precv_frame->u.hdr.rx_data;\r
u8 *psa; \r
sint parsing_length;\r
PNDIS_802_11_VARIABLE_IEs pIE;\r
- u8 FIXED_IE =4;\r
- u16 stat_code, j, switch_time, switch_timeout;\r
+ u8 FIXED_IE = 4;\r
+ u16 status_code, j, switch_time, switch_timeout;\r
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;\r
int ret = _SUCCESS;\r
\r
+ if (padapter->tdlsinfo.ch_switch_prohibited == _TRUE)\r
+ { DBG_871X("[TDLS] Ignore %s since ch_switch_prohibited = _TRUE\n", __FUNCTION__);\r
+ return _SUCCESS;\r
+ }\r
+\r
psa = get_sa(ptr);\r
ptdls_sta = rtw_get_stainfo(pstapriv, psa);\r
\r
- //if channel switch is running and receiving Unsolicited TDLS Channel Switch Response,\r
- //it will go back to base channel and terminate this channel switch procedure\r
- if(ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE ){\r
- if(pmlmeext->cur_channel==ptdls_sta->off_ch){\r
- DBG_871X("back to base channel %x\n", pmlmeext->cur_channel);\r
- ptdls_sta->option=TDLS_BASE_CH;\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_BASE_CH);\r
- }else{\r
+ /* If we receive Unsolicited TDLS Channel Switch Response when channel switch is running, */\r
+ /* we will go back to base channel and terminate this channel switch procedure */\r
+ if (ATOMIC_READ(&pchsw_info->chsw_on) == _TRUE) {\r
+ if (pmlmeext->cur_channel != rtw_get_oper_ch(padapter)) {\r
DBG_871X("receive unsolicited channel switch response \n");\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CS_OFF);\r
+ rtw_tdls_cmd(padapter, NULL, TDLS_CH_SW_BACK);\r
+ goto exit;\r
}\r
- ret = _FAIL;\r
- goto exit;\r
- }\r
-\r
- //avoiding duplicated or unconditional ch. switch. rsp\r
- if(!(ptdls_sta->tdls_sta_state & TDLS_CH_SW_INITIATOR_STATE))\r
- {\r
- ret = _FAIL;\r
- goto exit;\r
}\r
\r
- ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len+LLC_HEADER_SIZE+TYPE_LENGTH_FIELD_SIZE+1;\r
- parsing_length= ((union recv_frame *)precv_frame)->u.hdr.len\r
+ ptr +=prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE+ETH_TYPE_LEN+PAYLOAD_TYPE_LEN;\r
+ parsing_length = ((union recv_frame *)precv_frame)->u.hdr.len\r
-prx_pkt_attrib->hdrlen\r
-prx_pkt_attrib->iv_len\r
-prx_pkt_attrib->icv_len\r
-PAYLOAD_TYPE_LEN\r
-FIXED_IE;\r
\r
- _rtw_memcpy(&stat_code, ptr+2, 2);\r
+ _rtw_memcpy(&status_code, ptr+2, 2);\r
\r
- if(stat_code!=0){\r
+ if (status_code != 0) {\r
+ DBG_871X("[%s] status_code:%d\n", __FUNCTION__, status_code);\r
+ pchsw_info->ch_sw_state &= ~(TDLS_CH_SW_INITIATOR_STATE);\r
+ ATOMIC_SET(&pchsw_info->chsw_on, _FALSE);\r
ret = _FAIL;\r
goto exit;\r
}\r
\r
- //parsing information element\r
- for(j=FIXED_IE; j<parsing_length;){\r
-\r
+ /* Parsing information element */\r
+ for (j = FIXED_IE; j < parsing_length;) {\r
pIE = (PNDIS_802_11_VARIABLE_IEs)(ptr+ j);\r
\r
- switch (pIE->ElementID)\r
- {\r
- case _LINK_ID_IE_:\r
- break;\r
- case _CH_SWITCH_TIMING_:\r
- _rtw_memcpy(&switch_time, pIE->data, 2);\r
- if(switch_time > ptdls_sta->ch_switch_time)\r
- _rtw_memcpy(&ptdls_sta->ch_switch_time, &switch_time, 2);\r
-\r
- _rtw_memcpy(&switch_timeout, pIE->data+2, 2);\r
- if(switch_timeout > ptdls_sta->ch_switch_timeout)\r
- _rtw_memcpy(&ptdls_sta->ch_switch_timeout, &switch_timeout, 2);\r
-\r
- default:\r
- break;\r
+ switch (pIE->ElementID) {\r
+ case _LINK_ID_IE_:\r
+ break;\r
+ case _CH_SWITCH_TIMING_:\r
+ _rtw_memcpy(&switch_time, pIE->data, 2);\r
+ if (switch_time > ptdls_sta->ch_switch_time)\r
+ _rtw_memcpy(&ptdls_sta->ch_switch_time, &switch_time, 2);\r
+\r
+ _rtw_memcpy(&switch_timeout, pIE->data + 2, 2);\r
+ if (switch_timeout > ptdls_sta->ch_switch_timeout)\r
+ _rtw_memcpy(&ptdls_sta->ch_switch_timeout, &switch_timeout, 2);\r
+ break;\r
+ default:\r
+ break;\r
}\r
\r
j += (pIE->Length + 2);\r
- \r
}\r
\r
- ptdls_sta->tdls_sta_state &= ~(TDLS_CH_SW_INITIATOR_STATE);\r
- ptdls_sta->tdls_sta_state |=TDLS_CH_SWITCH_ON_STATE;\r
-\r
- //goto set_channel_workitem_callback()\r
- ptdls_sta->option=TDLS_OFF_CH;\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_OFF_CH);\r
+ if ((pmlmeext->cur_channel == rtw_get_oper_ch(padapter)) &&\r
+ (pchsw_info->ch_sw_state & TDLS_WAIT_CH_RSP_STATE)) {\r
+ ATOMIC_SET(&pchsw_info->chsw_on, _TRUE);\r
+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CH_SW);\r
+ }\r
\r
exit:\r
return ret;\r
}\r
+#endif /* CONFIG_TDLS_CH_SW */\r
\r
#ifdef CONFIG_WFD\r
void wfd_ie_tdls(_adapter * padapter, u8 *pframe, u32 *pktlen )\r
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };\r
u32 wfdielen = 0;\r
\r
- // WFD OUI\r
+ /* WFD OUI */\r
wfdielen = 0;\r
wfdie[ wfdielen++ ] = 0x50;\r
wfdie[ wfdielen++ ] = 0x6F;\r
wfdie[ wfdielen++ ] = 0x9A;\r
- wfdie[ wfdielen++ ] = 0x0A; // WFA WFD v1.0\r
-\r
- // Commented by Albert 20110825\r
- // According to the WFD Specification, the negotiation request frame should contain 3 WFD attributes\r
- // 1. WFD Device Information\r
- // 2. Associated BSSID ( Optional )\r
- // 3. Local IP Adress ( Optional )\r
-\r
- // WFD Device Information ATTR\r
- // Type:\r
+ wfdie[ wfdielen++ ] = 0x0A; /* WFA WFD v1.0 */\r
+\r
+ /*\r
+ * Commented by Albert 20110825\r
+ * According to the WFD Specification, the negotiation request frame should contain 3 WFD attributes\r
+ * 1. WFD Device Information\r
+ * 2. Associated BSSID ( Optional )\r
+ * 3. Local IP Adress ( Optional )\r
+ */\r
+\r
+ /* WFD Device Information ATTR */\r
+ /* Type: */\r
wfdie[ wfdielen++ ] = WFD_ATTR_DEVICE_INFO;\r
\r
- // Length:\r
- // Note: In the WFD specification, the size of length field is 2.\r
+ /* Length: */\r
+ /* Note: In the WFD specification, the size of length field is 2. */\r
RTW_PUT_BE16(wfdie + wfdielen, 0x0006);\r
wfdielen += 2;\r
\r
- // Value1:\r
- // WFD device information\r
- // available for WFD session + Preferred TDLS + WSD ( WFD Service Discovery )\r
+ /* Value1: */\r
+ /* WFD device information */\r
+ /* available for WFD session + Preferred TDLS + WSD ( WFD Service Discovery ) */\r
RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->wfd_device_type | WFD_DEVINFO_SESSION_AVAIL \r
| WFD_DEVINFO_PC_TDLS | WFD_DEVINFO_WSD);\r
wfdielen += 2;\r
\r
- // Value2:\r
- // Session Management Control Port\r
- // Default TCP port for RTSP messages is 554\r
+ /* Value2: */\r
+ /* Session Management Control Port */\r
+ /* Default TCP port for RTSP messages is 554 */\r
RTW_PUT_BE16(wfdie + wfdielen, pwfd_info->rtsp_ctrlport );\r
wfdielen += 2;\r
\r
- // Value3:\r
- // WFD Device Maximum Throughput\r
- // 300Mbps is the maximum throughput\r
+ /* Value3: */\r
+ /* WFD Device Maximum Throughput */\r
+ /* 300Mbps is the maximum throughput */\r
RTW_PUT_BE16(wfdie + wfdielen, 300);\r
wfdielen += 2;\r
\r
- // Associated BSSID ATTR\r
- // Type:\r
+ /* Associated BSSID ATTR */\r
+ /* Type: */\r
wfdie[ wfdielen++ ] = WFD_ATTR_ASSOC_BSSID;\r
\r
- // Length:\r
- // Note: In the WFD specification, the size of length field is 2.\r
+ /* Length: */\r
+ /* Note: In the WFD specification, the size of length field is 2. */\r
RTW_PUT_BE16(wfdie + wfdielen, 0x0006);\r
wfdielen += 2;\r
\r
- // Value:\r
- // Associated BSSID\r
- if ( check_fwstate( pmlmepriv, _FW_LINKED) == _TRUE )\r
- {\r
- _rtw_memcpy( wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN );\r
- }\r
+ /* Value: */\r
+ /* Associated BSSID */\r
+ if (check_fwstate( pmlmepriv, _FW_LINKED) == _TRUE)\r
+ _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[ 0 ], ETH_ALEN);\r
else\r
- {\r
- _rtw_memset( wfdie + wfdielen, 0x00, ETH_ALEN );\r
- }\r
+ _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN);\r
\r
- // Local IP Address ATTR\r
+ /* Local IP Address ATTR */\r
wfdie[ wfdielen++ ] = WFD_ATTR_LOCAL_IP_ADDR;\r
\r
- // Length:\r
- // Note: In the WFD specification, the size of length field is 2.\r
+ /* Length: */\r
+ /* Note: In the WFD specification, the size of length field is 2. */\r
RTW_PUT_BE16(wfdie + wfdielen, 0x0005);\r
wfdielen += 2;\r
\r
- // Version:\r
- // 0x01: Version1;IPv4\r
+ /* Version: */\r
+ /* 0x01: Version1;IPv4 */\r
wfdie[ wfdielen++ ] = 0x01; \r
\r
- // IPv4 Address\r
+ /* IPv4 Address */\r
_rtw_memcpy( wfdie + wfdielen, pwfd_info->ip_address, 4 );\r
wfdielen += 4;\r
\r
pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, wfdielen, (unsigned char *) wfdie, pktlen);\r
\r
}\r
-#endif //CONFIG_WFD\r
+#endif /* CONFIG_WFD */\r
\r
void rtw_build_tdls_setup_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, struct tdls_txmgmt *ptxmgmt)\r
{\r
- struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;\r
- struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;\r
- struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
struct registry_priv *pregistrypriv = &padapter->registrypriv;\r
+ struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
struct sta_info *ptdls_sta=rtw_get_stainfo( (&padapter->stapriv) , pattrib->dst);\r
\r
- u8 payload_type = 0x02;\r
- u8 category = RTW_WLAN_CATEGORY_TDLS;\r
- u8 action = TDLS_SETUP_REQUEST;\r
- u8 bssrate[NDIS_802_11_LENGTH_RATES_EX]; //Use NDIS_802_11_LENGTH_RATES_EX in order to call func.rtw_set_supported_rate\r
- int bssrate_len = 0, i = 0 ;\r
- u8 more_supportedrates = 0;\r
- unsigned int ie_len;\r
- struct mlme_priv *pmlmepriv = &padapter->mlmepriv;\r
- u8 link_id_addr[18] = {0};\r
- u8 iedata=0;\r
- u8 sup_ch[ 30 * 2 ] = {0x00 }, sup_ch_idx = 0, idx_5g = 2; //For supported channel\r
- u8 timeout_itvl[5]; //set timeout interval to maximum value\r
+ int i = 0 ;\r
u32 time;\r
u8 *pframe_head;\r
\r
- //SNonce \r
- if(pattrib->encrypt){\r
- for(i=0;i<8;i++){\r
+ /* SNonce */\r
+ if (pattrib->encrypt) {\r
+ for (i=0;i<8;i++) {\r
time=rtw_get_current_time();\r
_rtw_memcpy(&ptdls_sta->SNonce[4*i], (u8 *)&time, 4);\r
}\r
}\r
\r
- pframe_head = pframe; // For rtw_tdls_set_ht_cap()\r
+ pframe_head = pframe; /* For rtw_tdls_set_ht_cap() */\r
\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen));\r
- //category, action, dialog token\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
+ pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS);\r
+ pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);\r
\r
- //capability\r
- _rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2);\r
+ pframe = rtw_tdls_set_capability(padapter, pframe, pattrib);\r
+ pframe = rtw_tdls_set_supported_rate(padapter, pframe, pattrib);\r
+ pframe = rtw_tdls_set_sup_ch(&(padapter->mlmeextpriv), pframe, pattrib);\r
+ pframe = rtw_tdls_set_sup_reg_class(pframe, pattrib);\r
\r
- if(pattrib->encrypt)\r
- *pframe =*pframe | cap_Privacy;\r
- pframe += 2;\r
- pattrib->pktlen += 2;\r
+ if (pattrib->encrypt)\r
+ pframe = rtw_tdls_set_rsnie(ptxmgmt, pframe, pattrib, _TRUE, ptdls_sta);\r
\r
- //supported rates\r
- if(pmlmeext->cur_channel < 14 )\r
- {\r
- rtw_set_supported_rate(bssrate, WIRELESS_11BG_24N);\r
- bssrate_len = IEEE80211_CCK_RATE_LEN + IEEE80211_NUM_OFDM_RATESLEN;\r
- }\r
- else\r
- {\r
- rtw_set_supported_rate(bssrate, WIRELESS_11A_5N);\r
- bssrate_len = IEEE80211_NUM_OFDM_RATESLEN;\r
- }\r
+ pframe = rtw_tdls_set_ext_cap(pframe, pattrib);\r
\r
- //country(optional)\r
+ if (pattrib->encrypt) {\r
+ pframe = rtw_tdls_set_ftie(ptxmgmt\r
+ , pframe\r
+ , pattrib\r
+ , NULL\r
+ , ptdls_sta->SNonce);\r
\r
- if (bssrate_len > 8)\r
- {\r
- pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen));\r
- more_supportedrates = 1;\r
+ pframe = rtw_tdls_set_timeout_interval(ptxmgmt, pframe, pattrib, _TRUE, ptdls_sta);\r
}\r
- else\r
- {\r
- pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen));\r
- }\r
-\r
- //extended supported rates\r
- if(more_supportedrates==1){\r
- pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));\r
- }\r
-\r
- //supported channels\r
- pframe = rtw_tdls_set_sup_ch(pmlmeext, pframe, pattrib);\r
- \r
- // SRC IE\r
- pframe = rtw_set_ie( pframe, _SRC_IE_, sizeof(TDLS_SRC), TDLS_SRC, &(pattrib->pktlen));\r
- \r
- //RSNIE\r
- if(pattrib->encrypt)\r
- pframe = rtw_set_ie(pframe, _RSN_IE_2_, sizeof(TDLS_RSNIE), TDLS_RSNIE, &(pattrib->pktlen));\r
- \r
- //extended capabilities\r
- pframe = rtw_set_ie(pframe, _EXT_CAP_IE_ , sizeof(TDLS_EXT_CAPIE), TDLS_EXT_CAPIE, &(pattrib->pktlen));\r
\r
- //QoS capability(WMM_IE)\r
- pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, sizeof(TDLS_WMMIE), TDLS_WMMIE, &(pattrib->pktlen));\r
+ /* Sup_reg_classes(optional) */\r
+ if (pregistrypriv->ht_enable == _TRUE)\r
+ pframe = rtw_tdls_set_ht_cap(padapter, pframe_head, pattrib);\r
\r
+ pframe = rtw_tdls_set_bss_coexist(padapter, pframe, pattrib);\r
\r
- if(pattrib->encrypt){\r
- //FTIE\r
- _rtw_memset(pframe, 0, 84); //All fields except SNonce shall be set to 0\r
- _rtw_memset(pframe, _FTIE_, 1); //version\r
- _rtw_memset((pframe+1), 82, 1); //length\r
- _rtw_memcpy((pframe+52), ptdls_sta->SNonce, 32);\r
- pframe += 84;\r
- pattrib->pktlen += 84;\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _TRUE);\r
\r
- //Timeout interval\r
- timeout_itvl[0]=0x02;\r
- _rtw_memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4);\r
- pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen));\r
- }\r
-\r
- //Sup_reg_classes(optional)\r
- //HT capabilities\r
- pframe += rtw_tdls_set_ht_cap(padapter, pframe_head, pattrib);\r
-\r
- //20/40 BSS coexistence\r
- if(pmlmepriv->num_FortyMHzIntolerant>0)\r
- iedata |= BIT(2);//20 MHz BSS Width Request\r
- pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen));\r
- \r
- //Link identifier\r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->src, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->dst, 6);\r
- pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
+ if ((pregistrypriv->wmm_enable == _TRUE) || (padapter->mlmepriv.htpriv.ht_option == _TRUE))\r
+ pframe = rtw_tdls_set_qos_cap(pframe, pattrib);\r
\r
#ifdef CONFIG_WFD\r
wfd_ie_tdls( padapter, pframe, &(pattrib->pktlen) );\r
-#endif //CONFIG_WFD\r
+#endif /* CONFIG_WFD */\r
\r
}\r
\r
void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, struct tdls_txmgmt *ptxmgmt)\r
{\r
- struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);\r
- struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);\r
+ struct registry_priv *pregistrypriv = &padapter->registrypriv;\r
struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
struct sta_info *ptdls_sta;\r
- struct registry_priv *pregistrypriv = &padapter->registrypriv;\r
-\r
- u8 payload_type = 0x02; \r
- unsigned char category = RTW_WLAN_CATEGORY_TDLS;\r
- unsigned char action = TDLS_SETUP_RESPONSE;\r
- unsigned char bssrate[NDIS_802_11_LENGTH_RATES_EX]; \r
- int bssrate_len = 0;\r
- u8 more_supportedrates = 0;\r
- unsigned int ie_len;\r
- unsigned char *p;\r
- struct mlme_priv *pmlmepriv = &padapter->mlmepriv;\r
- u8 link_id_addr[18] = {0};\r
- u8 iedata=0;\r
- u8 timeout_itvl[5]; //setup response timeout interval will copy from request\r
- u8 ANonce[32]; //maybe it can put in ontdls_req\r
- u8 k; //for random ANonce\r
- u8 *pftie=NULL, *ptimeout_ie=NULL, *plinkid_ie=NULL, *prsnie=NULL, *pftie_mic=NULL;\r
+ u8 k; /* for random ANonce */\r
+ u8 *pftie=NULL, *ptimeout_ie = NULL, *plinkid_ie = NULL, *prsnie = NULL, *pftie_mic = NULL;\r
u32 time;\r
u8 *pframe_head;\r
\r
ptdls_sta = rtw_get_stainfo( &(padapter->stapriv) , pattrib->dst);\r
\r
- if(ptdls_sta == NULL )\r
- {\r
- DBG_871X("[%s] %d\n", __FUNCTION__, __LINE__);\r
- return;\r
- }\r
+ if (ptdls_sta == NULL)\r
+ DBG_871X("[%s] %d ptdls_sta is NULL\n", __FUNCTION__, __LINE__);\r
\r
- if(pattrib->encrypt){\r
- for(k=0;k<8;k++){\r
- time=rtw_get_current_time();\r
+ if (pattrib->encrypt && ptdls_sta != NULL) {\r
+ for (k=0;k<8;k++) {\r
+ time = rtw_get_current_time();\r
_rtw_memcpy(&ptdls_sta->ANonce[4*k], (u8*)&time, 4);\r
}\r
}\r
\r
pframe_head = pframe;\r
\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); \r
- //category, action, status code\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 2, (u8 *)&ptdls_sta->stat_code, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
+ pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS);\r
+ pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt);\r
\r
- if(ptdls_sta->stat_code!=0) //invalid setup request\r
- {\r
- DBG_871X("ptdls_sta->stat_code:%04x \n", ptdls_sta->stat_code); \r
+ if (ptxmgmt->status_code != 0) {\r
+ DBG_871X("[%s] status_code:%04x \n", __FUNCTION__, ptxmgmt->status_code);\r
return;\r
}\r
\r
- //dialog token\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen));\r
-\r
- //capability\r
- _rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2);\r
-\r
- if(pattrib->encrypt )\r
- *pframe =*pframe | cap_Privacy;\r
- pframe += 2;\r
- pattrib->pktlen += 2;\r
-\r
- //supported rates\r
- //supported rates\r
- if(pmlmeext->cur_channel < 14 )\r
- {\r
- rtw_set_supported_rate(bssrate, WIRELESS_11BG_24N);\r
- bssrate_len = IEEE80211_CCK_RATE_LEN + IEEE80211_NUM_OFDM_RATESLEN;\r
- }\r
- else\r
- {\r
- rtw_set_supported_rate(bssrate, WIRELESS_11A_5N);\r
- bssrate_len = IEEE80211_NUM_OFDM_RATESLEN;\r
- }\r
-\r
- if (bssrate_len > 8)\r
- {\r
- pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen));\r
- more_supportedrates = 1;\r
- }\r
- else\r
- {\r
- pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen));\r
- }\r
-\r
- //country(optional)\r
- //extended supported rates\r
- if(more_supportedrates==1){\r
- pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));\r
- }\r
-\r
- //supported channels\r
- pframe = rtw_tdls_set_sup_ch(pmlmeext, pframe, pattrib);\r
- \r
- // SRC IE\r
- pframe = rtw_set_ie(pframe, _SRC_IE_ , sizeof(TDLS_SRC), TDLS_SRC, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_capability(padapter, pframe, pattrib);\r
+ pframe = rtw_tdls_set_supported_rate(padapter, pframe, pattrib);\r
+ pframe = rtw_tdls_set_sup_ch(&(padapter->mlmeextpriv), pframe, pattrib);\r
+ pframe = rtw_tdls_set_sup_reg_class(pframe, pattrib);\r
\r
- //RSNIE\r
- if(pattrib->encrypt){\r
+ if (pattrib->encrypt) {\r
prsnie = pframe;\r
- pframe = rtw_set_ie(pframe, _RSN_IE_2_, sizeof(ptdls_sta->TDLS_RSNIE), ptdls_sta->TDLS_RSNIE, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_rsnie(ptxmgmt, pframe, pattrib, _FALSE, ptdls_sta);\r
}\r
\r
- //extended capabilities\r
- pframe = rtw_set_ie(pframe, _EXT_CAP_IE_ , sizeof(TDLS_EXT_CAPIE), TDLS_EXT_CAPIE, &(pattrib->pktlen));\r
-\r
- //QoS capability(WMM_IE)\r
- pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, sizeof(TDLS_WMMIE), TDLS_WMMIE, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_ext_cap(pframe, pattrib);\r
\r
- if(pattrib->encrypt){\r
- wpa_tdls_generate_tpk(padapter, ptdls_sta);\r
+ if (pattrib->encrypt) {\r
+ if (rtw_tdls_is_driver_setup(padapter) == _TRUE)\r
+ wpa_tdls_generate_tpk(padapter, ptdls_sta);\r
\r
- //FTIE\r
pftie = pframe;\r
pftie_mic = pframe+4;\r
- _rtw_memset(pframe, 0, 84); //All fields except SNonce shall be set to 0\r
- _rtw_memset(pframe, _FTIE_, 1); //version\r
- _rtw_memset((pframe+1), 82, 1); //length\r
- _rtw_memcpy((pframe+20), ptdls_sta->ANonce, 32);\r
- _rtw_memcpy((pframe+52), ptdls_sta->SNonce, 32);\r
- pframe += 84;\r
- pattrib->pktlen += 84;\r
-\r
- //Timeout interval\r
+ pframe = rtw_tdls_set_ftie(ptxmgmt\r
+ , pframe\r
+ , pattrib\r
+ , ptdls_sta->ANonce\r
+ , ptdls_sta->SNonce);\r
+\r
ptimeout_ie = pframe;\r
- timeout_itvl[0]=0x02;\r
- _rtw_memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4);\r
- pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_timeout_interval(ptxmgmt, pframe, pattrib, _FALSE, ptdls_sta);\r
}\r
\r
- //Sup_reg_classes(optional)\r
- //HT capabilities\r
- pframe += rtw_tdls_set_ht_cap(padapter, pframe_head, pattrib);\r
-\r
- //20/40 BSS coexistence\r
- if(pmlmepriv->num_FortyMHzIntolerant>0)\r
- iedata |= BIT(2);//20 MHz BSS Width Request\r
- pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen));\r
+ /* Sup_reg_classes(optional) */\r
+ if (pregistrypriv->ht_enable == _TRUE)\r
+ pframe = rtw_tdls_set_ht_cap(padapter, pframe_head, pattrib);\r
+ \r
+ pframe = rtw_tdls_set_bss_coexist(padapter, pframe, pattrib);\r
\r
- //Link identifier\r
plinkid_ie = pframe;\r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->dst, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->src, 6);\r
- pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _FALSE);\r
\r
- //fill FTIE mic\r
- if(pattrib->encrypt)\r
+ /* Fill FTIE mic */\r
+ if (pattrib->encrypt && rtw_tdls_is_driver_setup(padapter) == _TRUE)\r
wpa_tdls_ftie_mic(ptdls_sta->tpk.kck, 2, plinkid_ie, prsnie, ptimeout_ie, pftie, pftie_mic);\r
\r
+ if ((pregistrypriv->wmm_enable == _TRUE) || (padapter->mlmepriv.htpriv.ht_option == _TRUE))\r
+ pframe = rtw_tdls_set_qos_cap(pframe, pattrib);\r
+\r
#ifdef CONFIG_WFD\r
wfd_ie_tdls( padapter, pframe, &(pattrib->pktlen) );\r
-#endif //CONFIG_WFD\r
+#endif /* CONFIG_WFD */\r
\r
}\r
\r
struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
struct sta_info *ptdls_sta=rtw_get_stainfo( (&padapter->stapriv) , pattrib->dst);\r
\r
- u8 payload_type = 0x02; \r
- unsigned char category = RTW_WLAN_CATEGORY_TDLS;\r
- unsigned char action = TDLS_SETUP_CONFIRM;\r
- u8 more_supportedrates = 0;\r
unsigned int ie_len;\r
unsigned char *p;\r
- u8 timeout_itvl[5]; //set timeout interval to maximum value\r
u8 wmm_param_ele[24] = {0};\r
- struct mlme_priv *pmlmepriv = &padapter->mlmepriv;\r
- u8 link_id_addr[18] = {0};\r
u8 *pftie=NULL, *ptimeout_ie=NULL, *plinkid_ie=NULL, *prsnie=NULL, *pftie_mic=NULL;\r
\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen));\r
- //category, action, status code, dialog token\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 2, (u8 *)&ptdls_sta->stat_code, &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
+ pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS);\r
+ pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);\r
\r
- if(ptdls_sta->stat_code!=0) //invalid setup request\r
+ if (ptxmgmt->status_code!=0)\r
return;\r
\r
- //RSNIE\r
- if(pattrib->encrypt){\r
+ if (pattrib->encrypt) {\r
prsnie = pframe;\r
- pframe = rtw_set_ie(pframe, _RSN_IE_2_, sizeof(TDLS_RSNIE), TDLS_RSNIE, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_rsnie(ptxmgmt, pframe, pattrib, _TRUE, ptdls_sta);\r
}\r
\r
- //EDCA param set; WMM param ele.\r
- if(pattrib->encrypt){\r
- //FTIE\r
+ if (pattrib->encrypt) {\r
pftie = pframe;\r
pftie_mic = pframe+4;\r
- _rtw_memset(pframe, 0, 84); //All fields except SNonce shall be set to 0\r
- _rtw_memset(pframe, _FTIE_, 1); //version\r
- _rtw_memset((pframe+1), 82, 1); //length\r
- _rtw_memcpy((pframe+20), ptdls_sta->ANonce, 32);\r
- _rtw_memcpy((pframe+52), ptdls_sta->SNonce, 32);\r
- pframe += 84;\r
- pattrib->pktlen += 84;\r
-\r
- //Timeout interval\r
+ pframe = rtw_tdls_set_ftie(ptxmgmt\r
+ , pframe\r
+ , pattrib\r
+ , ptdls_sta->ANonce\r
+ , ptdls_sta->SNonce);\r
+\r
ptimeout_ie = pframe;\r
- timeout_itvl[0]=0x02;\r
- _rtw_memcpy(timeout_itvl+1, (u8 *)(&ptdls_sta->TDLS_PeerKey_Lifetime), 4);\r
- ptdls_sta->TPK_count=0;\r
- _set_timer(&ptdls_sta->TPK_timer, ptdls_sta->TDLS_PeerKey_Lifetime/TPK_RESEND_COUNT);\r
- pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_timeout_interval(ptxmgmt, pframe, pattrib, _TRUE, ptdls_sta);\r
+\r
+ if (rtw_tdls_is_driver_setup(padapter) == _TRUE) {\r
+ /* Start TPK timer */\r
+ ptdls_sta->TPK_count=0;\r
+ _set_timer(&ptdls_sta->TPK_timer, ONE_SEC);\r
+ }\r
}\r
\r
- //HT operation; todo\r
- //Link identifier\r
+ /* HT operation; todo */\r
plinkid_ie = pframe;\r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->src, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->dst, 6);\r
- pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _TRUE);\r
\r
- //FTIE mic\r
- if(pattrib->encrypt)\r
+ if (pattrib->encrypt && (rtw_tdls_is_driver_setup(padapter) == _TRUE))\r
wpa_tdls_ftie_mic(ptdls_sta->tpk.kck, 3, plinkid_ie, prsnie, ptimeout_ie, pftie, pftie_mic);\r
\r
- //WMM Parameter Set\r
- if(&pmlmeinfo->WMM_param)\r
- {\r
- _rtw_memcpy(wmm_param_ele, WMM_PARA_OUI, 6);\r
- _rtw_memcpy(wmm_param_ele+6, (u8 *)&pmlmeinfo->WMM_param, sizeof(pmlmeinfo->WMM_param));\r
- pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_, 24, wmm_param_ele, &(pattrib->pktlen)); \r
- }\r
-\r
+ if (ptdls_sta->qos_option == _TRUE)\r
+ pframe = rtw_tdls_set_wmm_params(padapter, pframe, pattrib);\r
}\r
\r
void rtw_build_tdls_teardown_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, struct tdls_txmgmt *ptxmgmt)\r
{\r
-\r
- struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
- u8 payload_type = 0x02;\r
- unsigned char category = RTW_WLAN_CATEGORY_TDLS;\r
- u8 action = ptxmgmt->action_code;\r
- u8 link_id_addr[18] = {0};\r
+ struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
struct sta_info *ptdls_sta = rtw_get_stainfo( &(padapter->stapriv) , pattrib->dst);\r
+ u8 *pftie = NULL, *pftie_mic = NULL, *plinkid_ie = NULL;\r
\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); \r
- //category, action, reason code\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 2, (u8 *)&ptxmgmt->status_code, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
+ pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS);\r
+ pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt);\r
\r
- //Link identifier\r
- if(ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){ \r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->dst, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->src, 6);\r
- }else if(ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){\r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->src, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->dst, 6);\r
+ if (pattrib->encrypt) {\r
+ pftie = pframe;\r
+ pftie_mic = pframe + 4;\r
+ pframe = rtw_tdls_set_ftie(ptxmgmt\r
+ , pframe\r
+ , pattrib\r
+ , ptdls_sta->ANonce\r
+ , ptdls_sta->SNonce);\r
}\r
- pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
- \r
+\r
+ plinkid_ie = pframe;\r
+ if (ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE)\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _FALSE);\r
+ else if (ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE)\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _TRUE);\r
+\r
+ if (pattrib->encrypt && (rtw_tdls_is_driver_setup(padapter) == _TRUE))\r
+ wpa_tdls_teardown_ftie_mic(ptdls_sta->tpk.kck, plinkid_ie, ptxmgmt->status_code, 1, 4, pftie, pftie_mic);\r
}\r
\r
void rtw_build_tdls_dis_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, struct tdls_txmgmt *ptxmgmt)\r
{\r
+ struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
\r
- struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
- u8 payload_type = 0x02;\r
- u8 category = RTW_WLAN_CATEGORY_TDLS;\r
- u8 action = TDLS_DISCOVERY_REQUEST;\r
- u8 link_id_addr[18] = {0};\r
- static u8 dialogtoken=0;\r
-\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); \r
- //category, action, reason code\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));\r
- if(ptxmgmt->external_support == _TRUE) {\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(ptxmgmt->dialog_token), &(pattrib->pktlen));\r
- } else {\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(dialogtoken), &(pattrib->pktlen));\r
- dialogtoken = (dialogtoken+1)%256;\r
- }\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
+ pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS);\r
+ pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _TRUE);\r
\r
- //Link identifier\r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->src, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->dst, 6);\r
- pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
- \r
}\r
\r
-void rtw_build_tdls_dis_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 dialog, u8 privacy)\r
+void rtw_build_tdls_dis_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, struct tdls_txmgmt *ptxmgmt, u8 privacy)\r
{\r
+ struct registry_priv *pregistrypriv = &padapter->registrypriv;\r
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;\r
- struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;\r
struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
- struct registry_priv *pregistrypriv = &padapter->registrypriv;\r
-\r
- u8 category = RTW_WLAN_CATEGORY_PUBLIC;\r
- u8 action = TDLS_DISCOVERY_RESPONSE;\r
- u8 bssrate[NDIS_802_11_LENGTH_RATES_EX];\r
- int bssrate_len = 0;\r
- u8 more_supportedrates = 0;\r
- u8 *p;\r
- struct mlme_priv *pmlmepriv = &padapter->mlmepriv;\r
- u8 link_id_addr[18] = {0};\r
- u8 iedata=0;\r
- u8 timeout_itvl[5]; //set timeout interval to maximum value\r
- u32 timeout_interval= TPK_RESEND_COUNT * 1000;\r
u8 *pframe_head, pktlen_index;\r
\r
- pktlen_index = pattrib->pktlen; // For mgmt frame, pattrib->pktlen would count frame header\r
+ pktlen_index = pattrib->pktlen;\r
pframe_head = pframe;\r
\r
- //category, action, dialog token\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(dialog), &(pattrib->pktlen));\r
-\r
- //capability\r
- _rtw_memcpy(pframe, rtw_get_capability_from_ie(pmlmeinfo->network.IEs), 2);\r
-\r
- if(privacy)\r
- *pframe =*pframe | cap_Privacy;\r
- pframe += 2;\r
- pattrib->pktlen += 2;\r
+ pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_PUBLIC);\r
+ pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_capability(padapter, pframe, pattrib);\r
\r
- //supported rates\r
- rtw_set_supported_rate(bssrate, WIRELESS_11BG_24N);\r
- bssrate_len = IEEE80211_CCK_RATE_LEN + IEEE80211_NUM_OFDM_RATESLEN;\r
+ pframe = rtw_tdls_set_supported_rate(padapter, pframe, pattrib);\r
\r
- if (bssrate_len > 8)\r
- {\r
- pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , 8, bssrate, &(pattrib->pktlen));\r
- more_supportedrates = 1;\r
- }\r
- else\r
- {\r
- pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen));\r
- }\r
-\r
- //extended supported rates\r
- if(more_supportedrates==1){\r
- pframe = rtw_set_ie(pframe, _EXT_SUPPORTEDRATES_IE_ , (bssrate_len - 8), (bssrate + 8), &(pattrib->pktlen));\r
- }\r
-\r
- //supported channels\r
pframe = rtw_tdls_set_sup_ch(pmlmeext, pframe, pattrib);\r
\r
- //RSNIE\r
- if(privacy)\r
- pframe = rtw_set_ie(pframe, _RSN_IE_2_, sizeof(TDLS_RSNIE), TDLS_RSNIE, &(pattrib->pktlen));\r
-\r
- //extended capability\r
- pframe = rtw_set_ie(pframe, _EXT_CAP_IE_ , sizeof(TDLS_EXT_CAPIE), TDLS_EXT_CAPIE, &(pattrib->pktlen));\r
+ if (privacy)\r
+ pframe = rtw_tdls_set_rsnie(ptxmgmt, pframe, pattrib, _TRUE, NULL);\r
\r
- if(privacy){\r
- //FTIE\r
- _rtw_memset(pframe, 0, 84); //All fields shall be set to 0\r
- _rtw_memset(pframe, _FTIE_, 1); //version\r
- _rtw_memset((pframe+1), 82, 1); //length\r
- pframe += 84;\r
- pattrib->pktlen += 84;\r
+ pframe = rtw_tdls_set_ext_cap(pframe, pattrib);\r
\r
- //Timeout interval\r
- timeout_itvl[0]=0x02;\r
- _rtw_memcpy(timeout_itvl+1, &timeout_interval, 4);\r
- pframe = rtw_set_ie(pframe, _TIMEOUT_ITVL_IE_, 5, timeout_itvl, &(pattrib->pktlen));\r
+ if (privacy) {\r
+ pframe = rtw_tdls_set_ftie(ptxmgmt, pframe, pattrib, NULL, NULL);\r
+ pframe = rtw_tdls_set_timeout_interval(ptxmgmt, pframe, pattrib, _TRUE, NULL);\r
}\r
\r
- //Sup_reg_classes(optional)\r
- //HT capabilities\r
- pframe += rtw_tdls_set_ht_cap(padapter, pframe_head - pktlen_index, pattrib);\r
-\r
- //20/40 BSS coexistence\r
- if(pmlmepriv->num_FortyMHzIntolerant>0)\r
- iedata |= BIT(2);//20 MHz BSS Width Request\r
- pframe = rtw_set_ie(pframe, EID_BSSCoexistence, 1, &iedata, &(pattrib->pktlen));\r
-\r
- //Link identifier\r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->dst, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->src, 6);\r
- pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
+ if (pregistrypriv->ht_enable == _TRUE)\r
+ pframe = rtw_tdls_set_ht_cap(padapter, pframe_head - pktlen_index, pattrib);\r
+ \r
+ pframe = rtw_tdls_set_bss_coexist(padapter, pframe, pattrib);\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _FALSE);\r
\r
}\r
\r
-void rtw_build_tdls_peer_traffic_indication_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe)\r
+\r
+void rtw_build_tdls_peer_traffic_indication_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, struct tdls_txmgmt *ptxmgmt)\r
{\r
\r
struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
- u8 payload_type = 0x02;\r
- unsigned char category = RTW_WLAN_CATEGORY_TDLS;\r
- unsigned char action = TDLS_PEER_TRAFFIC_INDICATION;\r
-\r
- u8 link_id_addr[18] = {0};\r
u8 AC_queue=0;\r
struct sta_info *ptdls_sta = rtw_get_stainfo(&padapter->stapriv, pattrib->dst);\r
\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); \r
- //category, action, reason code\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(ptdls_sta->dialog), &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
+ pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS);\r
+ pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);\r
\r
- //Link identifier\r
- if(ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){ \r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->dst, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->src, 6);\r
- }else if(ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){\r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->src, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->dst, 6);\r
- }\r
- pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
+ if (ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE)\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _FALSE);\r
+ else if (ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE)\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _TRUE);\r
\r
- //PTI control\r
- //PU buffer status\r
- if(ptdls_sta->uapsd_bk&BIT(1))\r
+ /* PTI control */\r
+ /* PU buffer status */\r
+ if (ptdls_sta->uapsd_bk & BIT(1))\r
AC_queue=BIT(0);\r
- if(ptdls_sta->uapsd_be&BIT(1))\r
+ if (ptdls_sta->uapsd_be & BIT(1))\r
AC_queue=BIT(1);\r
- if(ptdls_sta->uapsd_vi&BIT(1))\r
+ if (ptdls_sta->uapsd_vi & BIT(1))\r
AC_queue=BIT(2);\r
- if(ptdls_sta->uapsd_vo&BIT(1))\r
+ if (ptdls_sta->uapsd_vo & BIT(1))\r
AC_queue=BIT(3);\r
pframe = rtw_set_ie(pframe, _PTI_BUFFER_STATUS_, 1, &AC_queue, &(pattrib->pktlen));\r
\r
}\r
\r
-void rtw_build_tdls_peer_traffic_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe)\r
+void rtw_build_tdls_peer_traffic_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, struct tdls_txmgmt *ptxmgmt)\r
{\r
\r
struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
- u8 payload_type = 0x02;\r
- u8 category = RTW_WLAN_CATEGORY_TDLS;\r
- u8 action = TDLS_PEER_TRAFFIC_RESPONSE;\r
- u8 link_id_addr[18] = {0};\r
struct sta_info *ptdls_sta = rtw_get_stainfo(&padapter->stapriv, pattrib->dst);\r
- static u8 dialogtoken=0;\r
\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); \r
- //category, action, reason code\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &ptdls_sta->dialog, &(pattrib->pktlen));\r
-\r
- //Link identifier\r
- if(ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){ \r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->dst, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->src, 6);\r
- }else if(ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){\r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->src, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->dst, 6);\r
- }\r
- pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
+ pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS);\r
+ pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_dialog(pframe, pattrib, ptxmgmt);\r
\r
+ if (ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE)\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _FALSE);\r
+ else if (ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE)\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _TRUE);\r
}\r
\r
-void rtw_build_tdls_ch_switch_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe)\r
+#ifdef CONFIG_TDLS_CH_SW\r
+void rtw_build_tdls_ch_switch_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, struct tdls_txmgmt *ptxmgmt)\r
{\r
\r
struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
- struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;\r
- u8 payload_type = 0x02;\r
- unsigned char category = RTW_WLAN_CATEGORY_TDLS;\r
- unsigned char action = TDLS_CHANNEL_SWITCH_REQUEST;\r
- u8 link_id_addr[18] = {0};\r
- struct sta_priv *pstapriv = &padapter->stapriv; \r
+ struct sta_priv *pstapriv = &padapter->stapriv;\r
struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst);\r
- u8 ch_switch_timing[4] = {0};\r
- u16 switch_time= CH_SWITCH_TIME, switch_timeout=CH_SWITCH_TIMEOUT; \r
+ u16 switch_time= CH_SWITCH_TIME * 1000, switch_timeout=CH_SWITCH_TIMEOUT * 1000;\r
\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); \r
- //category, action, target_ch\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(ptdlsinfo->candidate_ch), &(pattrib->pktlen));\r
+ ptdls_sta->ch_switch_time=switch_time;\r
+ ptdls_sta->ch_switch_timeout=switch_timeout;\r
\r
- //Link identifier\r
- if(ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){ \r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->dst, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->src, 6);\r
- }else if(ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){\r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->src, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->dst, 6);\r
- }\r
- pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
+ pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS);\r
+ pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_target_ch(padapter, pframe, pattrib);\r
+ pframe = rtw_tdls_set_reg_class(pframe, pattrib, ptdls_sta);\r
\r
- //ch switch timing\r
- _rtw_memcpy(ch_switch_timing, &switch_time, 2);\r
- _rtw_memcpy(ch_switch_timing+2, &switch_timeout, 2);\r
- pframe = rtw_set_ie(pframe, _CH_SWITCH_TIMING_, 4, ch_switch_timing, &(pattrib->pktlen));\r
+ if (ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE)\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _FALSE);\r
+ else if (ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE)\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _TRUE);\r
\r
- //update ch switch attrib to sta_info\r
- ptdls_sta->off_ch=ptdlsinfo->candidate_ch;\r
- ptdls_sta->ch_switch_time=switch_time;\r
- ptdls_sta->ch_switch_timeout=switch_timeout;\r
+ pframe = rtw_tdls_set_ch_sw(pframe, pattrib, ptdls_sta);\r
\r
}\r
\r
-void rtw_build_tdls_ch_switch_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe)\r
+void rtw_build_tdls_ch_switch_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, struct tdls_txmgmt *ptxmgmt)\r
{\r
\r
struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
- u8 payload_type = 0x02;\r
- unsigned char category = RTW_WLAN_CATEGORY_TDLS;\r
- unsigned char action = TDLS_CHANNEL_SWITCH_RESPONSE;\r
- u8 link_id_addr[18] = {0};\r
struct sta_priv *pstapriv = &padapter->stapriv; \r
struct sta_info *ptdls_sta = rtw_get_stainfo(pstapriv, pattrib->dst);\r
- struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;\r
- struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;\r
- u8 ch_switch_timing[4] = {0};\r
\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); \r
- //category, action, status_code\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));\r
- pframe = rtw_set_fixed_ie(pframe, 2, (u8 *)&ptdls_sta->stat_code, &(pattrib->pktlen));\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
+ pframe = rtw_tdls_set_category(pframe, pattrib, RTW_WLAN_CATEGORY_TDLS);\r
+ pframe = rtw_tdls_set_action(pframe, pattrib, ptxmgmt);\r
+ pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt);\r
\r
- //Link identifier\r
- if(ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){ \r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->dst, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->src, 6);\r
- }else if(ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){\r
- _rtw_memcpy(link_id_addr, pattrib->ra, 6);\r
- _rtw_memcpy((link_id_addr+6), pattrib->src, 6);\r
- _rtw_memcpy((link_id_addr+12), pattrib->dst, 6);\r
- }\r
- pframe = rtw_set_ie(pframe, _LINK_ID_IE_, 18, link_id_addr, &(pattrib->pktlen));\r
-\r
- //ch switch timing\r
- _rtw_memcpy(ch_switch_timing, &ptdls_sta->ch_switch_time, 2);\r
- _rtw_memcpy(ch_switch_timing+2, &ptdls_sta->ch_switch_timeout, 2);\r
- pframe = rtw_set_ie(pframe, _CH_SWITCH_TIMING_, 4, ch_switch_timing, &(pattrib->pktlen));\r
+ if (ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE)\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _FALSE);\r
+ else if (ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE)\r
+ pframe = rtw_tdls_set_linkid(pframe, pattrib, _TRUE);\r
\r
+ pframe = rtw_tdls_set_ch_sw(pframe, pattrib, ptdls_sta);\r
}\r
+#endif\r
\r
#ifdef CONFIG_WFD\r
void rtw_build_tunneled_probe_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe)\r
struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
struct wifidirect_info *pwdinfo = &padapter->wdinfo;\r
struct wifidirect_info *pbuddy_wdinfo = &padapter->pbuddy_adapter->wdinfo;\r
- u8 payload_type = 0x02;\r
u8 category = RTW_WLAN_CATEGORY_P2P;\r
u8 WFA_OUI[3] = { 0x50, 0x6f, 0x9a};\r
u8 probe_req = 4;\r
u8 wfdielen = 0;\r
\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); \r
- //category, OUI, frame_body_type\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
pframe = rtw_set_fixed_ie(pframe, 3, WFA_OUI, &(pattrib->pktlen));\r
pframe = rtw_set_fixed_ie(pframe, 1, &(probe_req), &(pattrib->pktlen));\r
\r
- if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))\r
- {\r
+ if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {\r
wfdielen = build_probe_req_wfd_ie(pwdinfo, pframe);\r
pframe += wfdielen;\r
pattrib->pktlen += wfdielen;\r
- }\r
- else if(!rtw_p2p_chk_state(pbuddy_wdinfo, P2P_STATE_NONE))\r
- {\r
+ } else if (!rtw_p2p_chk_state(pbuddy_wdinfo, P2P_STATE_NONE)) {\r
wfdielen = build_probe_req_wfd_ie(pbuddy_wdinfo, pframe);\r
pframe += wfdielen;\r
pattrib->pktlen += wfdielen;\r
struct pkt_attrib *pattrib = &pxmitframe->attrib;\r
struct wifidirect_info *pwdinfo = &padapter->wdinfo;\r
struct wifidirect_info *pbuddy_wdinfo = &padapter->pbuddy_adapter->wdinfo;\r
- u8 payload_type = 0x02;\r
u8 category = RTW_WLAN_CATEGORY_P2P;\r
u8 WFA_OUI[3] = { 0x50, 0x6f, 0x9a};\r
u8 probe_rsp = 5;\r
u8 wfdielen = 0;\r
\r
- //payload type\r
- pframe = rtw_set_fixed_ie(pframe, 1, &(payload_type), &(pattrib->pktlen)); \r
- //category, OUI, frame_body_type\r
+ pframe = rtw_tdls_set_payload_type(pframe, pattrib);\r
pframe = rtw_set_fixed_ie(pframe, 1, &(category), &(pattrib->pktlen));\r
pframe = rtw_set_fixed_ie(pframe, 3, WFA_OUI, &(pattrib->pktlen));\r
pframe = rtw_set_fixed_ie(pframe, 1, &(probe_rsp), &(pattrib->pktlen));\r
\r
- if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))\r
- {\r
+ if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) {\r
wfdielen = build_probe_resp_wfd_ie(pwdinfo, pframe, 1);\r
pframe += wfdielen;\r
pattrib->pktlen += wfdielen;\r
- }\r
- else if(!rtw_p2p_chk_state(pbuddy_wdinfo, P2P_STATE_NONE))\r
- {\r
+ } else if (!rtw_p2p_chk_state(pbuddy_wdinfo, P2P_STATE_NONE)) {\r
wfdielen = build_probe_resp_wfd_ie(pbuddy_wdinfo, pframe, 1);\r
pframe += wfdielen;\r
pattrib->pktlen += wfdielen;\r
}\r
\r
}\r
-#endif //CONFIG_WFD\r
+#endif /* CONFIG_WFD */\r
\r
void _tdls_tpk_timer_hdl(void *FunctionContext)\r
{\r
\r
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
ptdls_sta->TPK_count++;\r
- //TPK_timer set 1000 as default\r
- //retry timer should set at least 301 sec.\r
- if(ptdls_sta->TPK_count==TPK_RESEND_COUNT){\r
+ /* TPK_timer expired in a second */\r
+ /* Retry timer should set at least 301 sec. */\r
+ if (ptdls_sta->TPK_count >= ptdls_sta->TDLS_PeerKey_Lifetime) {\r
+ DBG_871X("[TDLS] %s, Re-Setup TDLS link with "MAC_FMT" since TPK lifetime expires!\n", __FUNCTION__, MAC_ARG(ptdls_sta->hwaddr));\r
ptdls_sta->TPK_count=0;\r
_rtw_memcpy(txmgmt.peer, ptdls_sta->hwaddr, ETH_ALEN);\r
issue_tdls_setup_req(ptdls_sta->padapter, &txmgmt, _FALSE);\r
}\r
- \r
- _set_timer(&ptdls_sta->TPK_timer, ptdls_sta->TDLS_PeerKey_Lifetime/TPK_RESEND_COUNT);\r
+\r
+ _set_timer(&ptdls_sta->TPK_timer, ONE_SEC);\r
}\r
\r
-// TDLS_DONE_CH_SEN: channel sensing and report candidate channel\r
-// TDLS_OFF_CH: first time set channel to off channel\r
-// TDLS_BASE_CH: when go back to the channel linked with AP, send null data to peer STA as an indication\r
+#ifdef CONFIG_TDLS_CH_SW\r
void _tdls_ch_switch_timer_hdl(void *FunctionContext)\r
{\r
-\r
struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext;\r
_adapter *padapter = ptdls_sta->padapter;\r
- \r
- if( ptdls_sta->option == TDLS_DONE_CH_SEN ){\r
- rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_DONE_CH_SEN);\r
- }else if( ptdls_sta->option == TDLS_OFF_CH ){\r
- issue_nulldata_to_TDLS_peer_STA(ptdls_sta->padapter, ptdls_sta->hwaddr, 0, 0, 0);\r
- _set_timer(&ptdls_sta->base_ch_timer, 500);\r
- }else if( ptdls_sta->option == TDLS_BASE_CH){\r
- issue_nulldata_to_TDLS_peer_STA(ptdls_sta->padapter, ptdls_sta->hwaddr, 0, 0, 0);\r
+ struct tdls_ch_switch *pchsw_info = &padapter->tdlsinfo.chsw_info;\r
+\r
+ //DBG_871X("%s %d, tdls_sta_state:0x%08x\n", __FUNCTION__, __LINE__, ptdls_sta->tdls_sta_state);\r
+\r
+ if (padapter->mlmeextpriv.cur_channel != rtw_get_oper_ch(padapter)) {\r
+ if (!(pchsw_info->ch_sw_state & TDLS_PEER_AT_OFF_STATE)) {\r
+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CH_SW_BACK);\r
+ ATOMIC_SET(&pchsw_info->chsw_on, _FALSE);\r
+ DBG_871X("[TDLS] %s, can't get traffic from op_ch:%d\n", __FUNCTION__, rtw_get_oper_ch(padapter));\r
+ } else {\r
+ //DBG_871X("%s %d\n", __FUNCTION__, __LINE__);\r
+ //_set_timer(&ptdls_sta->delay_timer, padapter->mlmeextpriv.mlmext_info.bcn_interval - 5 - ptdls_sta->ch_switch_timeout/1000);\r
+ }\r
+ } else {\r
+ //DBG_871X("%s %d, op_ch:%d, tdls_state:0x%08x\n", __FUNCTION__, __LINE__, rtw_get_oper_ch(padapter), ptdls_sta->tdls_sta_state);\r
}\r
-}\r
\r
-void _tdls_base_ch_timer_hdl(void *FunctionContext)\r
-{\r
- struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext;\r
- rtw_tdls_cmd(ptdls_sta->padapter, ptdls_sta->hwaddr, TDLS_P_OFF_CH);\r
+#if 0\r
+ if (!(pchsw_info->ch_sw_state & TDLS_PEER_AT_OFF_STATE)) {\r
+ //SelectChannel(padapter, padapter->mlmeextpriv.cur_channel);\r
+ ATOMIC_SET(&pchsw_info->chsw_on, _FALSE);\r
+ DBG_871X("%s %d, op_ch:%d, tdls_state:0x%08x\n", __FUNCTION__, __LINE__, rtw_get_oper_ch(padapter), ptdls_sta->tdls_sta_state);\r
+ }\r
+\r
+ if (pchsw_info->ch_sw_state & TDLS_CH_SW_INITIATOR_STATE) {\r
+ if (padapter->mlmeextpriv.cur_channel != rtw_get_oper_ch(padapter)) {\r
+ DBG_871X("%s %d\n", __FUNCTION__, __LINE__);\r
+ _set_timer(&ptdls_sta->delay_timer, padapter->mlmeextpriv.mlmext_info.bcn_interval - 5 - ptdls_sta->ch_switch_timeout/1000);\r
+ //_set_timer(&ptdls_sta->delay_timer, 1000);\r
+ } else {\r
+ DBG_871X("%s %d\n", __FUNCTION__, __LINE__);\r
+ issue_tdls_ch_switch_req(padapter, ptdls_sta);\r
+ //_set_timer(&ptdls_sta->delay_timer, 500);\r
+ }\r
+ }\r
+#endif\r
}\r
\r
-void _tdls_off_ch_timer_hdl(void *FunctionContext)\r
+void _tdls_delay_timer_hdl(void *FunctionContext)\r
{\r
struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext;\r
- rtw_tdls_cmd(ptdls_sta->padapter, ptdls_sta->hwaddr, TDLS_P_BASE_CH );\r
+ _adapter *padapter = ptdls_sta->padapter;\r
+ struct tdls_ch_switch *pchsw_info = &padapter->tdlsinfo.chsw_info;\r
+\r
+ DBG_871X("[TDLS] %s, op_ch:%d, tdls_state:0x%08x\n", __FUNCTION__, rtw_get_oper_ch(padapter), ptdls_sta->tdls_sta_state);\r
+ pchsw_info->delay_switch_back = _TRUE;\r
}\r
+#endif\r
\r
void _tdls_handshake_timer_hdl(void *FunctionContext)\r
{\r
struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext;\r
+ _adapter *padapter = ptdls_sta->padapter;\r
+ struct tdls_txmgmt txmgmt;\r
\r
- if(ptdls_sta != NULL)\r
- {\r
- if( !(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) )\r
+ _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));\r
+ _rtw_memcpy(txmgmt.peer, ptdls_sta->hwaddr, ETH_ALEN);\r
+ txmgmt.status_code = _RSON_TDLS_TEAR_UN_RSN_;\r
+\r
+ if (ptdls_sta != NULL) {\r
+ DBG_871X("[TDLS] Handshake time out\n");\r
+ if (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) \r
{\r
- DBG_871X("tdls handshake time out\n");\r
- rtw_tdls_cmd(ptdls_sta->padapter, ptdls_sta->hwaddr, TDLS_TEAR_STA );\r
+ issue_tdls_teardown(padapter, &txmgmt, _TRUE);\r
+ }\r
+ else\r
+ {\r
+ rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_TEAR_STA);\r
}\r
}\r
}\r
_rtw_memcpy(txmgmt.peer, ptdls_sta->hwaddr, ETH_ALEN);\r
txmgmt.status_code = _RSON_TDLS_TEAR_TOOFAR_;\r
\r
- if(ptdls_sta != NULL)\r
- {\r
- if( ptdls_sta->tdls_sta_state & TDLS_WAIT_PTR_STATE )\r
- {\r
- DBG_871X("Doesn't receive PTR from peer dev:"MAC_FMT"; Send TDLS Tear Down\n", MAC_ARG(ptdls_sta->hwaddr));\r
+ if (ptdls_sta != NULL) {\r
+ if (ptdls_sta->tdls_sta_state & TDLS_WAIT_PTR_STATE) {\r
+ DBG_871X("[TDLS] Doesn't receive PTR from peer dev:"MAC_FMT"; "\r
+ "Send TDLS Tear Down\n", MAC_ARG(ptdls_sta->hwaddr));\r
issue_tdls_teardown(padapter, &txmgmt, _FALSE);\r
}\r
}\r
{\r
psta->padapter=padapter;\r
_init_timer(&psta->TPK_timer, padapter->pnetdev, _tdls_tpk_timer_hdl, psta);\r
- _init_timer(&psta->option_timer, padapter->pnetdev, _tdls_ch_switch_timer_hdl, psta);\r
- _init_timer(&psta->base_ch_timer, padapter->pnetdev, _tdls_base_ch_timer_hdl, psta);\r
- _init_timer(&psta->off_ch_timer, padapter->pnetdev, _tdls_off_ch_timer_hdl, psta);\r
+#ifdef CONFIG_TDLS_CH_SW \r
+ _init_timer(&psta->ch_sw_timer, padapter->pnetdev, _tdls_ch_switch_timer_hdl, psta);\r
+ _init_timer(&psta->delay_timer, padapter->pnetdev, _tdls_delay_timer_hdl, psta);\r
+#endif\r
_init_timer(&psta->handshake_timer, padapter->pnetdev, _tdls_handshake_timer_hdl, psta);\r
_init_timer(&psta->pti_timer, padapter->pnetdev, _tdls_pti_timer_hdl, psta);\r
}\r
void rtw_free_tdls_timer(struct sta_info *psta)\r
{\r
_cancel_timer_ex(&psta->TPK_timer);\r
- _cancel_timer_ex(&psta->option_timer);\r
- _cancel_timer_ex(&psta->base_ch_timer);\r
- _cancel_timer_ex(&psta->off_ch_timer);\r
+#ifdef CONFIG_TDLS_CH_SW \r
+ _cancel_timer_ex(&psta->ch_sw_timer);\r
+ _cancel_timer_ex(&psta->delay_timer);\r
+#endif\r
_cancel_timer_ex(&psta->handshake_timer);\r
_cancel_timer_ex(&psta->pti_timer);\r
}\r
rtw_hal_update_sta_rate_mask(padapter, psta);\r
tx_ra_bitmap = psta->ra_mask;\r
\r
- if ( pcur_network->Configuration.DSConfig > 14 ) {\r
- // 5G band\r
+ if (pcur_network->Configuration.DSConfig > 14) {\r
if (tx_ra_bitmap & 0xffff000)\r
sta_band |= WIRELESS_11_5N | WIRELESS_11A;\r
else\r
return tx_ra_bitmap;\r
}\r
\r
-#endif //CONFIG_TDLS\r
+int rtw_tdls_is_driver_setup(_adapter *padapter)\r
+{\r
+ return padapter->tdlsinfo.driver_setup;\r
+}\r
+\r
+const char * rtw_tdls_action_txt(enum TDLS_ACTION_FIELD action)\r
+{\r
+ switch (action) {\r
+ case TDLS_SETUP_REQUEST:\r
+ return "TDLS_SETUP_REQUEST";\r
+ case TDLS_SETUP_RESPONSE:\r
+ return "TDLS_SETUP_RESPONSE";\r
+ case TDLS_SETUP_CONFIRM:\r
+ return "TDLS_SETUP_CONFIRM";\r
+ case TDLS_TEARDOWN:\r
+ return "TDLS_TEARDOWN";\r
+ case TDLS_PEER_TRAFFIC_INDICATION:\r
+ return "TDLS_PEER_TRAFFIC_INDICATION";\r
+ case TDLS_CHANNEL_SWITCH_REQUEST:\r
+ return "TDLS_CHANNEL_SWITCH_REQUEST";\r
+ case TDLS_CHANNEL_SWITCH_RESPONSE:\r
+ return "TDLS_CHANNEL_SWITCH_RESPONSE";\r
+ case TDLS_PEER_PSM_REQUEST:\r
+ return "TDLS_PEER_PSM_REQUEST";\r
+ case TDLS_PEER_PSM_RESPONSE:\r
+ return "TDLS_PEER_PSM_RESPONSE";\r
+ case TDLS_PEER_TRAFFIC_RESPONSE:\r
+ return "TDLS_PEER_TRAFFIC_RESPONSE";\r
+ case TDLS_DISCOVERY_REQUEST:\r
+ return "TDLS_DISCOVERY_REQUEST";\r
+ case TDLS_DISCOVERY_RESPONSE:\r
+ return "TDLS_DISCOVERY_RESPONSE";\r
+ default:\r
+ return "UNKNOWN";\r
+ }\r
+}\r
\r
+#endif /* CONFIG_TDLS */\r
projects / firefly-linux-kernel-4.4.55.git / blobdiff