mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-09 23:03:05 +00:00
Change "if(" to "if (" and the same changes for "while", "for", "switch" and "do"
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
124abebb96
commit
a55f866a62
105 changed files with 6893 additions and 6893 deletions
230
core/rtw_p2p.c
230
core/rtw_p2p.c
|
|
@ -29,7 +29,7 @@ int rtw_p2p_is_channel_list_ok( u8 desired_ch, u8* ch_list, u8 ch_cnt )
|
|||
{
|
||||
int found = 0, i = 0;
|
||||
|
||||
for( i = 0; i < ch_cnt; i++ )
|
||||
for ( i = 0; i < ch_cnt; i++ )
|
||||
{
|
||||
if ( ch_list[ i ] == desired_ch )
|
||||
{
|
||||
|
|
@ -103,7 +103,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
|||
plist = get_next(plist);
|
||||
|
||||
|
||||
if(psta->is_p2p_device)
|
||||
if (psta->is_p2p_device)
|
||||
{
|
||||
tmplen = 0;
|
||||
|
||||
|
|
@ -133,7 +133,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
|||
_rtw_memcpy(pcur, psta->secdev_types_list, psta->num_of_secdev_type*8);
|
||||
pcur += psta->num_of_secdev_type*8;
|
||||
|
||||
if(psta->dev_name_len>0)
|
||||
if (psta->dev_name_len>0)
|
||||
{
|
||||
//*(u16*)(pcur) = cpu_to_be16( WPS_ATTR_DEVICE_NAME );
|
||||
RTW_PUT_BE16(pcur, WPS_ATTR_DEVICE_NAME);
|
||||
|
|
@ -163,7 +163,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
|||
}
|
||||
_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
|
||||
|
||||
if(attr_len>0)
|
||||
if (attr_len>0)
|
||||
{
|
||||
len = rtw_set_p2p_attr_content(pbuf, P2P_ATTR_GROUP_INFO, attr_len, pdata_attr);
|
||||
}
|
||||
|
|
@ -531,7 +531,7 @@ u32 build_beacon_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
|||
// Group Capability Bitmap, 1 byte
|
||||
capability = P2P_DEVCAP_INVITATION_PROC|P2P_DEVCAP_CLIENT_DISCOVERABILITY;
|
||||
capability |= ((P2P_GRPCAP_GO | P2P_GRPCAP_INTRABSS) << 8);
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_PROVISIONING_ING))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_PROVISIONING_ING))
|
||||
capability |= (P2P_GRPCAP_GROUP_FORMATION<<8);
|
||||
|
||||
capability = cpu_to_le16(capability);
|
||||
|
|
@ -941,7 +941,7 @@ u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunnel
|
|||
wfdie[ wfdielen++ ] = 0;
|
||||
wfdie[ wfdielen++ ] = 0;
|
||||
|
||||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
// WFD Session Information ATTR
|
||||
// Type:
|
||||
|
|
@ -993,7 +993,7 @@ u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
|||
struct wifi_display_info *pwfd_info = NULL;
|
||||
|
||||
// WFD OUI
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1948,11 +1948,11 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
|||
p2pie[ p2pielen++ ] = DMP_P2P_DEVCAP_SUPPORT;
|
||||
|
||||
// Group Capability Bitmap, 1 byte
|
||||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
p2pie[ p2pielen ] = (P2P_GRPCAP_GO | P2P_GRPCAP_INTRABSS);
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_PROVISIONING_ING))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_PROVISIONING_ING))
|
||||
p2pie[ p2pielen ] |= P2P_GRPCAP_GROUP_FORMATION;
|
||||
|
||||
p2pielen++;
|
||||
|
|
@ -1991,7 +1991,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
|||
// Type:
|
||||
// Length:
|
||||
// Value:
|
||||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
//go_add_noa_attr(pwdinfo);
|
||||
}
|
||||
|
|
@ -2005,7 +2005,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
|||
// + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes)
|
||||
//*(u16*) ( p2pie + p2pielen ) = cpu_to_le16( 21 + pwdinfo->device_name_len );
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if( _rtw_memcmp( pwdinfo->padapter->mlmepriv.sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN ) == _FALSE )
|
||||
if ( _rtw_memcmp( pwdinfo->padapter->mlmepriv.sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN ) == _FALSE )
|
||||
{
|
||||
RTW_PUT_LE16(p2pie + p2pielen, 21 + 8 + pwdinfo->device_name_len);
|
||||
}
|
||||
|
|
@ -2043,7 +2043,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
|||
|
||||
// Number of Secondary Device Types
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
if( _rtw_memcmp( pwdinfo->padapter->mlmepriv.sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN ) == _FALSE )
|
||||
if ( _rtw_memcmp( pwdinfo->padapter->mlmepriv.sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN ) == _FALSE )
|
||||
{
|
||||
p2pie[ p2pielen++ ] = 0x01;
|
||||
|
||||
|
|
@ -2079,7 +2079,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
|||
// Type:
|
||||
// Length:
|
||||
// Value:
|
||||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
p2pielen += go_add_group_info_attr(pwdinfo, p2pie + p2pielen);
|
||||
}
|
||||
|
|
@ -2281,7 +2281,7 @@ u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
|||
{
|
||||
int i, g_rate =0;
|
||||
|
||||
for( i = 0; i < rate_cnt; i++ )
|
||||
for ( i = 0; i < rate_cnt; i++ )
|
||||
{
|
||||
if ( ( ( *( p + 2 + i ) & 0xff ) != 0x02 ) &&
|
||||
( ( *( p + 2 + i ) & 0xff ) != 0x04 ) &&
|
||||
|
|
@ -2318,9 +2318,9 @@ u32 process_probe_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
|||
len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);
|
||||
|
||||
ssid_len &= 0xff; // Just last 1 byte is valid for ssid len of the probe request
|
||||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE) || rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE) || rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
if((p2pie=rtw_get_p2p_ie( pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_ , len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_ , NULL, &p2pielen)))
|
||||
if ((p2pie=rtw_get_p2p_ie( pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_ , len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_ , NULL, &p2pielen)))
|
||||
{
|
||||
if ( (p != NULL) && _rtw_memcmp( ( void * ) ( p+2 ), ( void * ) pwdinfo->p2p_wildcard_ssid , 7 ))
|
||||
{
|
||||
|
|
@ -2359,7 +2359,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
|||
u8 * p2p_ie;
|
||||
u32 p2p_ielen = 0;
|
||||
|
||||
if(!rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
if (!rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
return P2P_STATUS_FAIL_REQUEST_UNABLE;
|
||||
|
||||
frame_type = GetFrameSubType(pframe);
|
||||
|
|
@ -2390,7 +2390,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
|||
while ( p2p_ie )
|
||||
{
|
||||
//Check P2P Capability ATTR
|
||||
if( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*) &attr_contentlen) )
|
||||
if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*) &attr_contentlen) )
|
||||
{
|
||||
DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __FUNCTION__ );
|
||||
cap_attr = le16_to_cpu(cap_attr);
|
||||
|
|
@ -2401,11 +2401,11 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
|||
|
||||
|
||||
//Check P2P Device Info ATTR
|
||||
if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint*)&attr_contentlen))
|
||||
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint*)&attr_contentlen))
|
||||
{
|
||||
DBG_8192C( "[%s] Got P2P DEVICE INFO Attr!!\n", __FUNCTION__ );
|
||||
pattr_content = pbuf = rtw_zmalloc(attr_contentlen);
|
||||
if(pattr_content)
|
||||
if (pattr_content)
|
||||
{
|
||||
u8 num_of_secdev_type;
|
||||
u16 dev_name_len;
|
||||
|
|
@ -2429,7 +2429,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
|||
num_of_secdev_type = *pattr_content;
|
||||
pattr_content += 1;
|
||||
|
||||
if(num_of_secdev_type==0)
|
||||
if (num_of_secdev_type==0)
|
||||
{
|
||||
psta->num_of_secdev_type = 0;
|
||||
}
|
||||
|
|
@ -2449,7 +2449,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
|||
|
||||
//dev_name_len = attr_contentlen - ETH_ALEN - 2 - 8 - 1 - (num_of_secdev_type*8);
|
||||
psta->dev_name_len=0;
|
||||
if(WPS_ATTR_DEVICE_NAME == be16_to_cpu(*(u16*)pattr_content))
|
||||
if (WPS_ATTR_DEVICE_NAME == be16_to_cpu(*(u16*)pattr_content))
|
||||
{
|
||||
dev_name_len = be16_to_cpu(*(u16*)(pattr_content+2));
|
||||
|
||||
|
|
@ -2494,13 +2494,13 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
|
|||
u8 dev_addr[ETH_ALEN] = { 0x00 };
|
||||
u32 attr_contentlen = 0;
|
||||
|
||||
if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen))
|
||||
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen))
|
||||
{
|
||||
if(_rtw_memcmp(pwdinfo->device_addr, groupid, ETH_ALEN) &&
|
||||
if (_rtw_memcmp(pwdinfo->device_addr, groupid, ETH_ALEN) &&
|
||||
_rtw_memcmp(pwdinfo->p2p_group_ssid, groupid+ETH_ALEN, pwdinfo->p2p_group_ssid_len))
|
||||
{
|
||||
attr_contentlen=0;
|
||||
if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_ID, dev_addr, &attr_contentlen))
|
||||
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_ID, dev_addr, &attr_contentlen))
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
|
|
@ -2516,7 +2516,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
|
|||
|
||||
plist = get_next(plist);
|
||||
|
||||
if(psta->is_p2p_device && (psta->dev_cap&P2P_DEVCAP_CLIENT_DISCOVERABILITY) &&
|
||||
if (psta->is_p2p_device && (psta->dev_cap&P2P_DEVCAP_CLIENT_DISCOVERABILITY) &&
|
||||
_rtw_memcmp(psta->dev_addr, dev_addr, ETH_ALEN))
|
||||
{
|
||||
|
||||
|
|
@ -2582,7 +2582,7 @@ u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
|
|||
if ( rtw_get_wps_attr_content( wpsie, wps_ielen, WPS_ATTR_CONF_METHOD , ( u8* ) &uconfig_method, &attr_contentlen) )
|
||||
{
|
||||
uconfig_method = be16_to_cpu( uconfig_method );
|
||||
switch( uconfig_method )
|
||||
switch ( uconfig_method )
|
||||
{
|
||||
case WPS_CM_DISPLYA:
|
||||
{
|
||||
|
|
@ -2627,12 +2627,12 @@ u8 rtw_p2p_get_peer_ch_list(struct wifidirect_info *pwdinfo, u8 *ch_content, u8
|
|||
ch_content += 3;
|
||||
ch_cnt -= 3;
|
||||
|
||||
while( ch_cnt > 0)
|
||||
while ( ch_cnt > 0)
|
||||
{
|
||||
ch_content += 1;
|
||||
ch_cnt -= 1;
|
||||
temp = *ch_content;
|
||||
for( i = 0 ; i < temp ; i++, j++ )
|
||||
for ( i = 0 ; i < temp ; i++, j++ )
|
||||
{
|
||||
peer_ch_list[j] = *( ch_content + 1 + i );
|
||||
}
|
||||
|
|
@ -2648,7 +2648,7 @@ u8 rtw_p2p_check_peer_oper_ch(struct mlme_ext_priv *pmlmeext, u8 ch)
|
|||
{
|
||||
u8 i = 0;
|
||||
|
||||
for( i = 0; i < pmlmeext->max_chan_nums; i++ )
|
||||
for ( i = 0; i < pmlmeext->max_chan_nums; i++ )
|
||||
{
|
||||
if ( pmlmeext->channel_set[ i ].ChannelNum == ch )
|
||||
{
|
||||
|
|
@ -2664,11 +2664,11 @@ u8 rtw_p2p_ch_inclusion(struct mlme_ext_priv *pmlmeext, u8 *peer_ch_list, u8 pee
|
|||
int i = 0, j = 0, temp = 0;
|
||||
u8 ch_no = 0;
|
||||
|
||||
for( i = 0; i < peer_ch_num; i++ )
|
||||
for ( i = 0; i < peer_ch_num; i++ )
|
||||
{
|
||||
for( j = temp; j < pmlmeext->max_chan_nums; j++ )
|
||||
for ( j = temp; j < pmlmeext->max_chan_nums; j++ )
|
||||
{
|
||||
if( *( peer_ch_list + i ) == pmlmeext->channel_set[ j ].ChannelNum )
|
||||
if ( *( peer_ch_list + i ) == pmlmeext->channel_set[ j ].ChannelNum )
|
||||
{
|
||||
ch_list_inclusioned[ ch_no++ ] = *( peer_ch_list + i );
|
||||
temp = j;
|
||||
|
|
@ -2710,7 +2710,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
|
|||
// Commented by Kurt 20120113
|
||||
// If some device wants to do p2p handshake without sending prov_disc_req
|
||||
// We have to get peer_req_cm from here.
|
||||
if(_rtw_memcmp( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "000", 3) )
|
||||
if (_rtw_memcmp( pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "000", 3) )
|
||||
{
|
||||
rtw_get_wps_attr_content( wpsie, wps_ielen, WPS_ATTR_DEVICE_PWID, (u8*) &wps_devicepassword_id, &wps_devicepassword_id_len);
|
||||
wps_devicepassword_id = be16_to_cpu( wps_devicepassword_id );
|
||||
|
|
@ -2771,12 +2771,12 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
|
|||
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_ING);
|
||||
|
||||
//Check P2P Capability ATTR
|
||||
if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*)&attr_contentlen) )
|
||||
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*)&attr_contentlen) )
|
||||
{
|
||||
cap_attr = le16_to_cpu(cap_attr);
|
||||
|
||||
#if defined(CONFIG_WFD) && defined(CONFIG_TDLS)
|
||||
if(!(cap_attr & P2P_GRPCAP_INTRABSS) )
|
||||
if (!(cap_attr & P2P_GRPCAP_INTRABSS) )
|
||||
ptdlsinfo->ap_prohibited = _TRUE;
|
||||
#endif //defined(CONFIG_WFD) && defined(CONFIG_TDLS)
|
||||
}
|
||||
|
|
@ -2815,7 +2815,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
|
|||
rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT);
|
||||
}
|
||||
|
||||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
// Store the group id information.
|
||||
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN );
|
||||
|
|
@ -2838,7 +2838,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
|
|||
peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, ch_content, ch_cnt, peer_ch_list);
|
||||
ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned);
|
||||
|
||||
if( ch_num_inclusioned == 0)
|
||||
if ( ch_num_inclusioned == 0)
|
||||
{
|
||||
DBG_871X( "[%s] No common channel in channel list!\n", __FUNCTION__ );
|
||||
result = P2P_STATUS_FAIL_NO_COMMON_CH;
|
||||
|
|
@ -2846,7 +2846,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
|
|||
break;
|
||||
}
|
||||
|
||||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
if ( !rtw_p2p_is_channel_list_ok( pwdinfo->operating_channel,
|
||||
ch_list_inclusioned, ch_num_inclusioned) )
|
||||
|
|
@ -2974,11 +2974,11 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
|
|||
{
|
||||
|
||||
//Check P2P Capability ATTR
|
||||
if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*)&attr_contentlen) )
|
||||
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*)&attr_contentlen) )
|
||||
{
|
||||
cap_attr = le16_to_cpu(cap_attr);
|
||||
#ifdef CONFIG_TDLS
|
||||
if(!(cap_attr & P2P_GRPCAP_INTRABSS) )
|
||||
if (!(cap_attr & P2P_GRPCAP_INTRABSS) )
|
||||
ptdlsinfo->ap_prohibited = _TRUE;
|
||||
#endif // CONFIG_TDLS
|
||||
}
|
||||
|
|
@ -3058,7 +3058,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
|
|||
rtw_p2p_set_role(pwdinfo, P2P_ROLE_CLIENT);
|
||||
}
|
||||
|
||||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
// Store the group id information.
|
||||
_rtw_memcpy( pwdinfo->groupid_info.go_device_addr, pwdinfo->device_addr, ETH_ALEN );
|
||||
|
|
@ -3084,7 +3084,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
|
|||
peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, pwdinfo->channel_list_attr, pwdinfo->channel_list_attr_len, peer_ch_list);
|
||||
ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned);
|
||||
|
||||
if( ch_num_inclusioned == 0)
|
||||
if ( ch_num_inclusioned == 0)
|
||||
{
|
||||
DBG_871X( "[%s] No common channel in channel list!\n", __FUNCTION__ );
|
||||
result = P2P_STATUS_FAIL_NO_COMMON_CH;
|
||||
|
|
@ -3092,7 +3092,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
|
|||
break;
|
||||
}
|
||||
|
||||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_GO))
|
||||
{
|
||||
if ( !rtw_p2p_is_channel_list_ok( pwdinfo->operating_channel,
|
||||
ch_list_inclusioned, ch_num_inclusioned) )
|
||||
|
|
@ -3325,7 +3325,7 @@ void restore_p2p_state_handler( _adapter* padapter )
|
|||
|
||||
_func_enter_;
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL))
|
||||
{
|
||||
rtw_p2p_set_role(pwdinfo, P2P_ROLE_DEVICE);
|
||||
}
|
||||
|
|
@ -3337,7 +3337,7 @@ _func_enter_;
|
|||
struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv;
|
||||
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_RSP))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ) || rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_RSP))
|
||||
{
|
||||
set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);
|
||||
|
||||
|
|
@ -3348,7 +3348,7 @@ _func_enter_;
|
|||
|
||||
rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo));
|
||||
|
||||
if(rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE))
|
||||
if (rtw_p2p_chk_role(pwdinfo, P2P_ROLE_DEVICE))
|
||||
{
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
p2p_concurrent_handler( padapter );
|
||||
|
|
@ -3429,7 +3429,7 @@ _func_enter_;
|
|||
issue_nulldata(pbuddy_adapter, NULL, 0, 3, 500);
|
||||
|
||||
#else //CONFIG_IOCTL_CFG80211
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE))
|
||||
{
|
||||
// Now, the driver stays on the AP's channel.
|
||||
// If the pwdinfo->ext_listen_period = 0, that means the P2P listen state is not available on listen channel.
|
||||
|
|
@ -3476,7 +3476,7 @@ _func_enter_;
|
|||
// Todo: To check the value of pwdinfo->ext_listen_interval is equal to 0 or not.
|
||||
_set_timer( &pwdinfo->ap_p2p_switch_timer, pwdinfo->ext_listen_interval );
|
||||
}
|
||||
else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_OK))
|
||||
else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_OK))
|
||||
{
|
||||
// The driver had finished the P2P handshake successfully.
|
||||
val8 = 0;
|
||||
|
|
@ -3484,7 +3484,7 @@ _func_enter_;
|
|||
set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);
|
||||
issue_nulldata(pbuddy_adapter, NULL, 0, 3, 500);
|
||||
}
|
||||
else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ))
|
||||
else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ))
|
||||
{
|
||||
val8 = 1;
|
||||
set_channel_bwmode(padapter, pwdinfo->tx_prov_disc_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
|
||||
|
|
@ -3492,7 +3492,7 @@ _func_enter_;
|
|||
issue_probereq_p2p(padapter, NULL);
|
||||
_set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT );
|
||||
}
|
||||
else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) && pwdinfo->nego_req_info.benable == _TRUE)
|
||||
else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) && pwdinfo->nego_req_info.benable == _TRUE)
|
||||
{
|
||||
val8 = 1;
|
||||
set_channel_bwmode(padapter, pwdinfo->nego_req_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);
|
||||
|
|
@ -3500,7 +3500,7 @@ _func_enter_;
|
|||
issue_probereq_p2p(padapter, NULL);
|
||||
_set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT );
|
||||
}
|
||||
else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ ) && pwdinfo->invitereq_info.benable == _TRUE)
|
||||
else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ ) && pwdinfo->invitereq_info.benable == _TRUE)
|
||||
{
|
||||
/*
|
||||
val8 = 1;
|
||||
|
|
@ -3546,7 +3546,7 @@ _func_enter_;
|
|||
|
||||
}else
|
||||
#endif //CONFIG_CONCURRENT_MODE
|
||||
if( pcfg80211_wdinfo->restore_channel != pmlmeext->cur_channel )
|
||||
if ( pcfg80211_wdinfo->restore_channel != pmlmeext->cur_channel )
|
||||
{
|
||||
if ( !check_fwstate(&padapter->mlmepriv, _FW_LINKED ) )
|
||||
pmlmeext->cur_channel = pcfg80211_wdinfo->restore_channel;
|
||||
|
|
@ -3604,7 +3604,7 @@ static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *fram
|
|||
u8 *pattr = NULL;
|
||||
|
||||
//Check P2P_ATTR_CH_LIST
|
||||
if((pattr=rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, (uint*)&attr_contentlen))!=NULL)
|
||||
if ((pattr=rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, (uint*)&attr_contentlen))!=NULL)
|
||||
{
|
||||
int i;
|
||||
u32 num_of_ch;
|
||||
|
|
@ -3612,11 +3612,11 @@ static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *fram
|
|||
|
||||
attr_contentlen -= 3;
|
||||
|
||||
while(attr_contentlen>0)
|
||||
while (attr_contentlen>0)
|
||||
{
|
||||
num_of_ch = *(pattr_temp+1);
|
||||
|
||||
for(i=0; i<num_of_ch; i++)
|
||||
for (i=0; i<num_of_ch; i++)
|
||||
*(pattr_temp+2+i) = pbuddy_mlmeext->cur_channel;//forcing to the same channel
|
||||
|
||||
pattr_temp += (2+num_of_ch);
|
||||
|
|
@ -3627,7 +3627,7 @@ static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *fram
|
|||
//Check P2P_ATTR_OPERATING_CH
|
||||
attr_contentlen = 0;
|
||||
pattr = NULL;
|
||||
if((pattr = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, (uint*)&attr_contentlen))!=NULL)
|
||||
if ((pattr = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, NULL, (uint*)&attr_contentlen))!=NULL)
|
||||
{
|
||||
*(pattr+4) = pbuddy_mlmeext->cur_channel;//forcing to the same channel
|
||||
}
|
||||
|
|
@ -3651,7 +3651,7 @@ void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len)
|
|||
frame_body = (unsigned char *)(buf + sizeof(struct rtw_ieee80211_hdr_3addr));
|
||||
category = frame_body[0];
|
||||
|
||||
if(category == RTW_WLAN_CATEGORY_PUBLIC)
|
||||
if (category == RTW_WLAN_CATEGORY_PUBLIC)
|
||||
{
|
||||
action = frame_body[1];
|
||||
if (action == ACT_PUBLIC_VENDOR
|
||||
|
|
@ -3660,7 +3660,7 @@ void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len)
|
|||
{
|
||||
OUI_Subtype = frame_body[6];
|
||||
dialogToken = frame_body[7];
|
||||
switch( OUI_Subtype )//OUI Subtype
|
||||
switch ( OUI_Subtype )//OUI Subtype
|
||||
{
|
||||
case P2P_GO_NEGO_REQ:
|
||||
{
|
||||
|
|
@ -3717,7 +3717,7 @@ void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len)
|
|||
}
|
||||
|
||||
}
|
||||
else if(category == RTW_WLAN_CATEGORY_P2P)
|
||||
else if (category == RTW_WLAN_CATEGORY_P2P)
|
||||
{
|
||||
OUI_Subtype = frame_body[5];
|
||||
dialogToken = frame_body[6];
|
||||
|
|
@ -3727,7 +3727,7 @@ void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len)
|
|||
cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken);
|
||||
#endif
|
||||
|
||||
switch(OUI_Subtype)
|
||||
switch (OUI_Subtype)
|
||||
{
|
||||
case P2P_NOTICE_OF_ABSENCE:
|
||||
|
||||
|
|
@ -3769,7 +3769,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
|
|||
frame_body = (unsigned char *)(buf + sizeof(struct rtw_ieee80211_hdr_3addr));
|
||||
category = frame_body[0];
|
||||
//just for check
|
||||
if(category == RTW_WLAN_CATEGORY_PUBLIC)
|
||||
if (category == RTW_WLAN_CATEGORY_PUBLIC)
|
||||
{
|
||||
action = frame_body[1];
|
||||
if (action == ACT_PUBLIC_VENDOR
|
||||
|
|
@ -3789,24 +3789,24 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
|
|||
len-sizeof(struct rtw_ieee80211_hdr_3addr)-_PUBLIC_ACTION_IE_OFFSET_,
|
||||
NULL, &p2p_ielen);
|
||||
|
||||
switch( OUI_Subtype )//OUI Subtype
|
||||
switch ( OUI_Subtype )//OUI Subtype
|
||||
{
|
||||
u8 *cont;
|
||||
uint cont_len;
|
||||
case P2P_GO_NEGO_REQ:
|
||||
DBG_871X("RTW_%s:P2P_GO_NEGO_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
|
||||
|
||||
if(tx)
|
||||
if (tx)
|
||||
{
|
||||
#ifdef CONFIG_DRV_ISSUE_PROV_REQ // IOT FOR S2
|
||||
if(pwdev_priv->provdisc_req_issued == _FALSE)
|
||||
if (pwdev_priv->provdisc_req_issued == _FALSE)
|
||||
rtw_cfg80211_issue_p2p_provision_request(padapter, buf, len);
|
||||
#endif //CONFIG_DRV_ISSUE_PROV_REQ
|
||||
|
||||
//pwdev_priv->provdisc_req_issued = _FALSE;
|
||||
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
if(check_buddy_fwstate(padapter, _FW_LINKED))
|
||||
if (check_buddy_fwstate(padapter, _FW_LINKED))
|
||||
rtw_cfg80211_adjust_p2pie_channel(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr));
|
||||
#endif
|
||||
}
|
||||
|
|
@ -3816,14 +3816,14 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
|
|||
cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len);
|
||||
DBG_871X("RTW_%s:P2P_GO_NEGO_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
|
||||
|
||||
if(!tx)
|
||||
if (!tx)
|
||||
{
|
||||
pwdev_priv->provdisc_req_issued = _FALSE;
|
||||
}
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
else
|
||||
{
|
||||
if(check_buddy_fwstate(padapter, _FW_LINKED))
|
||||
if (check_buddy_fwstate(padapter, _FW_LINKED))
|
||||
rtw_cfg80211_adjust_p2pie_channel(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr));
|
||||
}
|
||||
#endif
|
||||
|
|
@ -3833,9 +3833,9 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
|
|||
DBG_871X("RTW_%s:P2P_GO_NEGO_CONF, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
|
||||
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
if(tx)
|
||||
if (tx)
|
||||
{
|
||||
if(check_buddy_fwstate(padapter, _FW_LINKED))
|
||||
if (check_buddy_fwstate(padapter, _FW_LINKED))
|
||||
rtw_cfg80211_adjust_p2pie_channel(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr));
|
||||
}
|
||||
#endif
|
||||
|
|
@ -3846,10 +3846,10 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
|
|||
int flags = -1;
|
||||
int op_ch = 0;
|
||||
|
||||
if(tx)
|
||||
if (tx)
|
||||
{
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
if(check_buddy_fwstate(padapter, _FW_LINKED))
|
||||
if (check_buddy_fwstate(padapter, _FW_LINKED))
|
||||
rtw_cfg80211_adjust_p2pie_channel(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr));
|
||||
#endif
|
||||
}
|
||||
|
|
@ -3875,10 +3875,10 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
|
|||
int status = -1;
|
||||
int op_ch = 0;
|
||||
|
||||
if(tx)
|
||||
if (tx)
|
||||
{
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
if(check_buddy_fwstate(padapter, _FW_LINKED))
|
||||
if (check_buddy_fwstate(padapter, _FW_LINKED))
|
||||
rtw_cfg80211_adjust_p2pie_channel(padapter, frame_body, len-sizeof(struct rtw_ieee80211_hdr_3addr));
|
||||
#endif
|
||||
}
|
||||
|
|
@ -3915,14 +3915,14 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
|
|||
|
||||
DBG_871X("RTW_%s:P2P_PROVISION_DISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
|
||||
|
||||
//if(tx)
|
||||
//if (tx)
|
||||
{
|
||||
pwdev_priv->provdisc_req_issued = _FALSE;
|
||||
|
||||
if( (p2p_ie=rtw_get_p2p_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, frame_body_len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen)))
|
||||
if ( (p2p_ie=rtw_get_p2p_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, frame_body_len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen)))
|
||||
{
|
||||
|
||||
if(rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, NULL, &contentlen))
|
||||
if (rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, NULL, &contentlen))
|
||||
{
|
||||
pwdev_priv->provdisc_req_issued = _FALSE;//case: p2p_client join p2p GO
|
||||
}
|
||||
|
|
@ -3949,7 +3949,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
|
|||
}
|
||||
|
||||
}
|
||||
else if(category == RTW_WLAN_CATEGORY_P2P)
|
||||
else if (category == RTW_WLAN_CATEGORY_P2P)
|
||||
{
|
||||
OUI_Subtype = frame_body[5];
|
||||
dialogToken = frame_body[6];
|
||||
|
|
@ -3961,7 +3961,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
|
|||
|
||||
is_p2p_frame = OUI_Subtype;
|
||||
|
||||
switch(OUI_Subtype)
|
||||
switch (OUI_Subtype)
|
||||
{
|
||||
case P2P_NOTICE_OF_ABSENCE:
|
||||
DBG_871X("RTW_%s:P2P_NOTICE_OF_ABSENCE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
|
||||
|
|
@ -4006,7 +4006,7 @@ void p2p_protocol_wk_hdl(_adapter *padapter, int intCmdType)
|
|||
|
||||
_func_enter_;
|
||||
|
||||
switch(intCmdType)
|
||||
switch (intCmdType)
|
||||
{
|
||||
case P2P_FIND_PHASE_WK:
|
||||
{
|
||||
|
|
@ -4104,15 +4104,15 @@ void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength)
|
|||
|
||||
_func_enter_;
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
{
|
||||
return;
|
||||
}
|
||||
#ifdef CONFIG_CONCURRENT_MODE
|
||||
if(padapter->iface_type != IFACE_PORT0)
|
||||
if (padapter->iface_type != IFACE_PORT0)
|
||||
return;
|
||||
#endif
|
||||
if(IELength <= _BEACON_IE_OFFSET_)
|
||||
if (IELength <= _BEACON_IE_OFFSET_)
|
||||
return;
|
||||
|
||||
ies = IEs + _BEACON_IE_OFFSET_;
|
||||
|
|
@ -4120,16 +4120,16 @@ _func_enter_;
|
|||
|
||||
p2p_ie = rtw_get_p2p_ie( ies, ies_len, NULL, &p2p_ielen);
|
||||
|
||||
while(p2p_ie)
|
||||
while (p2p_ie)
|
||||
{
|
||||
find_p2p = _TRUE;
|
||||
// Get Notice of Absence IE.
|
||||
if(rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_NOA, noa_attr, &attr_contentlen))
|
||||
if (rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_NOA, noa_attr, &attr_contentlen))
|
||||
{
|
||||
find_p2p_ps = _TRUE;
|
||||
noa_index = noa_attr[0];
|
||||
|
||||
if( (pwdinfo->p2p_ps_mode == P2P_PS_NONE) ||
|
||||
if ( (pwdinfo->p2p_ps_mode == P2P_PS_NONE) ||
|
||||
(noa_index != pwdinfo->noa_index) )// if index change, driver should reconfigure related setting.
|
||||
{
|
||||
pwdinfo->noa_index = noa_index;
|
||||
|
|
@ -4139,9 +4139,9 @@ _func_enter_;
|
|||
noa_offset = 2;
|
||||
noa_num = 0;
|
||||
// NoA length should be n*(13) + 2
|
||||
if(attr_contentlen > 2)
|
||||
if (attr_contentlen > 2)
|
||||
{
|
||||
while(noa_offset < attr_contentlen)
|
||||
while (noa_offset < attr_contentlen)
|
||||
{
|
||||
//_rtw_memcpy(&wifidirect_info->noa_count[noa_num], &noa_attr[noa_offset], 1);
|
||||
pwdinfo->noa_count[noa_num] = noa_attr[noa_offset];
|
||||
|
|
@ -4161,21 +4161,21 @@ _func_enter_;
|
|||
}
|
||||
pwdinfo->noa_num = noa_num;
|
||||
|
||||
if( pwdinfo->opp_ps == 1 )
|
||||
if ( pwdinfo->opp_ps == 1 )
|
||||
{
|
||||
pwdinfo->p2p_ps_mode = P2P_PS_CTWINDOW;
|
||||
// driver should wait LPS for entering CTWindow
|
||||
if(padapter->pwrctrlpriv.bFwCurrentInPSMode == _TRUE)
|
||||
if (padapter->pwrctrlpriv.bFwCurrentInPSMode == _TRUE)
|
||||
{
|
||||
p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 1);
|
||||
}
|
||||
}
|
||||
else if( pwdinfo->noa_num > 0 )
|
||||
else if ( pwdinfo->noa_num > 0 )
|
||||
{
|
||||
pwdinfo->p2p_ps_mode = P2P_PS_NOA;
|
||||
p2p_ps_wk_cmd(padapter, P2P_PS_ENABLE, 1);
|
||||
}
|
||||
else if( pwdinfo->p2p_ps_mode > P2P_PS_NONE)
|
||||
else if ( pwdinfo->p2p_ps_mode > P2P_PS_NONE)
|
||||
{
|
||||
p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1);
|
||||
}
|
||||
|
|
@ -4189,9 +4189,9 @@ _func_enter_;
|
|||
|
||||
}
|
||||
|
||||
if(find_p2p == _TRUE)
|
||||
if (find_p2p == _TRUE)
|
||||
{
|
||||
if( (pwdinfo->p2p_ps_mode > P2P_PS_NONE) && (find_p2p_ps == _FALSE) )
|
||||
if ( (pwdinfo->p2p_ps_mode > P2P_PS_NONE) && (find_p2p_ps == _FALSE) )
|
||||
{
|
||||
p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1);
|
||||
}
|
||||
|
|
@ -4208,7 +4208,7 @@ void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state)
|
|||
_func_enter_;
|
||||
|
||||
// Pre action for p2p state
|
||||
switch(p2p_ps_state)
|
||||
switch (p2p_ps_state)
|
||||
{
|
||||
case P2P_PS_DISABLE:
|
||||
pwdinfo->p2p_ps_state = p2p_ps_state;
|
||||
|
|
@ -4220,9 +4220,9 @@ _func_enter_;
|
|||
pwdinfo->opp_ps = 0;
|
||||
pwdinfo->noa_num = 0;
|
||||
pwdinfo->p2p_ps_mode = P2P_PS_NONE;
|
||||
if(padapter->pwrctrlpriv.bFwCurrentInPSMode == _TRUE)
|
||||
if (padapter->pwrctrlpriv.bFwCurrentInPSMode == _TRUE)
|
||||
{
|
||||
if(pwrpriv->smart_ps == 0)
|
||||
if (pwrpriv->smart_ps == 0)
|
||||
{
|
||||
pwrpriv->smart_ps = 2;
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(padapter->pwrctrlpriv.pwr_mode)));
|
||||
|
|
@ -4233,9 +4233,9 @@ _func_enter_;
|
|||
if (pwdinfo->p2p_ps_mode > P2P_PS_NONE) {
|
||||
pwdinfo->p2p_ps_state = p2p_ps_state;
|
||||
|
||||
if( pwdinfo->ctwindow > 0 )
|
||||
if ( pwdinfo->ctwindow > 0 )
|
||||
{
|
||||
if(pwrpriv->smart_ps != 0)
|
||||
if (pwrpriv->smart_ps != 0)
|
||||
{
|
||||
pwrpriv->smart_ps = 0;
|
||||
DBG_871X("%s(): Enter CTW, change SmartPS\n", __FUNCTION__);
|
||||
|
|
@ -4279,16 +4279,16 @@ _func_enter_;
|
|||
return res;
|
||||
}
|
||||
|
||||
if(enqueue)
|
||||
if (enqueue)
|
||||
{
|
||||
ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
|
||||
if(ph2c==NULL){
|
||||
if (ph2c==NULL){
|
||||
res= _FAIL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
|
||||
if(pdrvextra_cmd_parm==NULL){
|
||||
if (pdrvextra_cmd_parm==NULL){
|
||||
rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj));
|
||||
res= _FAIL;
|
||||
goto exit;
|
||||
|
|
@ -4321,7 +4321,7 @@ static void reset_ch_sitesurvey_timer_process (void *FunctionContext)
|
|||
_adapter *adapter = (_adapter *)FunctionContext;
|
||||
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
return;
|
||||
|
||||
DBG_871X( "[%s] In\n", __FUNCTION__ );
|
||||
|
|
@ -4335,7 +4335,7 @@ static void reset_ch_sitesurvey_timer_process2 (void *FunctionContext)
|
|||
_adapter *adapter = (_adapter *)FunctionContext;
|
||||
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
return;
|
||||
|
||||
DBG_871X( "[%s] In\n", __FUNCTION__ );
|
||||
|
|
@ -4349,7 +4349,7 @@ static void restore_p2p_state_timer_process (void *FunctionContext)
|
|||
_adapter *adapter = (_adapter *)FunctionContext;
|
||||
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
return;
|
||||
|
||||
p2p_protocol_wk_cmd( adapter, P2P_RESTORE_STATE_WK );
|
||||
|
|
@ -4363,13 +4363,13 @@ static void pre_tx_scan_timer_process (void *FunctionContext)
|
|||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
u8 _status = 0;
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
return;
|
||||
|
||||
_enter_critical_bh(&pmlmepriv->lock, &irqL);
|
||||
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ))
|
||||
{
|
||||
if ( _TRUE == pwdinfo->tx_prov_disc_info.benable ) // the provision discovery request frame is trigger to send or not
|
||||
{
|
||||
|
|
@ -4405,7 +4405,7 @@ static void find_phase_timer_process (void *FunctionContext)
|
|||
_adapter *adapter = (_adapter *)FunctionContext;
|
||||
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
return;
|
||||
|
||||
adapter->wdinfo.find_phase_state_exchange_cnt++;
|
||||
|
|
@ -4422,7 +4422,7 @@ void ap_p2p_switch_timer_process (void *FunctionContext)
|
|||
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev);
|
||||
#endif
|
||||
|
||||
if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
return;
|
||||
|
||||
#ifdef CONFIG_IOCTL_CFG80211
|
||||
|
|
@ -4680,7 +4680,7 @@ char * p2p_state_str[] = {
|
|||
|
||||
void dbg_rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state, const char *caller, int line)
|
||||
{
|
||||
if(!_rtw_p2p_chk_state(wdinfo, state)) {
|
||||
if (!_rtw_p2p_chk_state(wdinfo, state)) {
|
||||
enum P2P_STATE old_state = _rtw_p2p_state(wdinfo);
|
||||
_rtw_p2p_set_state(wdinfo, state);
|
||||
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_state from %s to %s\n", caller, line
|
||||
|
|
@ -4694,7 +4694,7 @@ void dbg_rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state,
|
|||
}
|
||||
void dbg_rtw_p2p_set_pre_state(struct wifidirect_info *wdinfo, enum P2P_STATE state, const char *caller, int line)
|
||||
{
|
||||
if(_rtw_p2p_pre_state(wdinfo) != state) {
|
||||
if (_rtw_p2p_pre_state(wdinfo) != state) {
|
||||
enum P2P_STATE old_state = _rtw_p2p_pre_state(wdinfo);
|
||||
_rtw_p2p_set_pre_state(wdinfo, state);
|
||||
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_pre_state from %s to %s\n", caller, line
|
||||
|
|
@ -4709,7 +4709,7 @@ void dbg_rtw_p2p_set_pre_state(struct wifidirect_info *wdinfo, enum P2P_STATE st
|
|||
#if 0
|
||||
void dbg_rtw_p2p_restore_state(struct wifidirect_info *wdinfo, const char *caller, int line)
|
||||
{
|
||||
if(wdinfo->pre_p2p_state != -1) {
|
||||
if (wdinfo->pre_p2p_state != -1) {
|
||||
DBG_871X("[CONFIG_DBG_P2P]%s:%d restore from %s to %s\n", caller, line
|
||||
, p2p_state_str[wdinfo->p2p_state], p2p_state_str[wdinfo->pre_p2p_state]
|
||||
);
|
||||
|
|
@ -4723,7 +4723,7 @@ void dbg_rtw_p2p_restore_state(struct wifidirect_info *wdinfo, const char *calle
|
|||
#endif
|
||||
void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, const char *caller, int line)
|
||||
{
|
||||
if(wdinfo->role != role) {
|
||||
if (wdinfo->role != role) {
|
||||
enum P2P_ROLE old_role = wdinfo->role;
|
||||
_rtw_p2p_set_role(wdinfo, role);
|
||||
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_role from %s to %s\n", caller, line
|
||||
|
|
@ -4755,7 +4755,7 @@ int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role)
|
|||
// Commented by Albert 2011/12/30
|
||||
// The driver just supports 1 P2P group operation.
|
||||
// So, this function will do nothing if the buddy adapter had enabled the P2P function.
|
||||
if(!rtw_p2p_chk_state(pbuddy_wdinfo, P2P_STATE_NONE))
|
||||
if (!rtw_p2p_chk_state(pbuddy_wdinfo, P2P_STATE_NONE))
|
||||
{
|
||||
// The buddy adapter had enabled the P2P function.
|
||||
return ret;
|
||||
|
|
@ -4790,7 +4790,7 @@ int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role)
|
|||
}
|
||||
|
||||
//Disable P2P function
|
||||
if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
|
||||
{
|
||||
_cancel_timer_ex( &pwdinfo->find_phase_timer );
|
||||
_cancel_timer_ex( &pwdinfo->restore_p2p_state_timer );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue