From 1d52d1060a45b7f7f9fc44908056f7b72e07c3e0 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 2 Mar 2015 10:54:45 -0600 Subject: [PATCH] rtl8188eu: Remove CONFIG_INTEL_WIDI This symbol was not defined. Signed-off-by: Larry Finger --- Makefile | 7 --- core/rtw_cmd.c | 5 -- core/rtw_mlme.c | 33 ------------- core/rtw_mlme_ext.c | 82 -------------------------------- core/rtw_p2p.c | 111 ++++--------------------------------------- core/rtw_wlan_util.c | 5 -- include/rtw_mlme.h | 33 ------------- os_dep/ioctl_linux.c | 96 +------------------------------------ os_dep/os_intfs.c | 17 ------- 9 files changed, 12 insertions(+), 377 deletions(-) diff --git a/Makefile b/Makefile index ecb9144..b27a5f4 100755 --- a/Makefile +++ b/Makefile @@ -21,7 +21,6 @@ CONFIG_USB_HCI = y CONFIG_POWER_SAVING = y CONFIG_USB_AUTOSUSPEND = n CONFIG_BT_COEXIST = n -CONFIG_INTEL_WIDI = n CONFIG_WAPI_SUPPORT = n CONFIG_EFUSE_CONFIG_FILE = n CONFIG_EXT_CLK = n @@ -108,10 +107,6 @@ ifeq ($(CONFIG_RTL8192CU_REDEFINE_1X1), y) EXTRA_CFLAGS += -DRTL8192C_RECONFIG_TO_1T1R endif -ifeq ($(CONFIG_INTEL_WIDI), y) -EXTRA_CFLAGS += -DCONFIG_INTEL_WIDI -endif - ifeq ($(CONFIG_WAPI_SUPPORT), y) EXTRA_CFLAGS += -DCONFIG_WAPI_SUPPORT endif @@ -184,8 +179,6 @@ rtk_core := core/rtw_cmd.o \ 8188eu-y += $(rtk_core) -8188eu-$(CONFIG_INTEL_WIDI) += core/rtw_intel_widi.o - 8188eu-$(CONFIG_WAPI_SUPPORT) += core/rtw_wapi.o \ core/rtw_wapi_sms4.o diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index f59ed20..07c8a82 100755 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -2779,11 +2779,6 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf) rtw_chk_hi_queue_hdl(padapter); break; #endif /* CONFIG_AP_MODE */ -#ifdef CONFIG_INTEL_WIDI - case INTEl_WIDI_WK_CID: - intel_widi_wk_hdl(padapter, pdrvextra_cmd->type_size, pdrvextra_cmd->pbuf); - break; -#endif /* CONFIG_INTEL_WIDI */ /* add for CONFIG_IEEE80211W, none 11w can use it */ case RESET_SECURITYPRIV: reset_securitypriv_hdl(padapter); diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index bbff562..833500d 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -1149,14 +1149,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) || _SUCCESS != rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, 1, NULL, 0) ) { rtw_set_roaming(adapter, 0); -#ifdef CONFIG_INTEL_WIDI - if(adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) - { - memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); - intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL); - DBG_871X("change to widi listen\n"); - } -#endif /* CONFIG_INTEL_WIDI */ rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); } else { @@ -1171,7 +1163,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) } indicate_wx_scan_complete_event(adapter); - /* DBG_871X("scan complete in %dms\n",rtw_get_passing_time_ms(pmlmepriv->scan_start_time)); */ _exit_critical_bh(&pmlmepriv->lock, &irqL); @@ -1378,24 +1369,11 @@ void rtw_indicate_connect(struct adapter *padapter) } rtw_set_roaming(padapter, 0); -#ifdef CONFIG_INTEL_WIDI - if(padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) - { - memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); - intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_WK, NULL); - DBG_871X("change to widi listen\n"); - } -#endif /* CONFIG_INTEL_WIDI */ - rtw_set_scan_deny(padapter, 3000); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("-rtw_indicate_connect: fw_state=0x%08x\n", get_fwstate(pmlmepriv))); - -; - } - /* *rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock */ @@ -2046,9 +2024,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) pmlmepriv->to_roaming--; /* this stadel_event is caused by roaming, decrease to_roaming */ else if (rtw_to_roaming(adapter) == 0) rtw_set_roaming(adapter, adapter->registrypriv.max_roaming_times); -#ifdef CONFIG_INTEL_WIDI - if(adapter->mlmepriv.widi_state != INTEL_WIDI_STATE_CONNECTED) -#endif /* CONFIG_INTEL_WIDI */ if(*((unsigned short *)(pstadel->rsvd)) != WLAN_REASON_EXPIRATION_CHK) rtw_set_roaming(adapter, 0); /* don't roam */ @@ -2160,14 +2135,6 @@ void _rtw_join_timeout_handler (struct adapter *adapter) } break; } else { -#ifdef CONFIG_INTEL_WIDI - if(adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) - { - memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); - intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL); - DBG_871X("change to widi listen\n"); - } -#endif /* CONFIG_INTEL_WIDI */ DBG_871X("%s We've try roaming but fail\n", __FUNCTION__); rtw_indicate_disconnect(adapter); break; diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index fdab99e..730d7b2 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -4197,11 +4197,6 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) #ifdef CONFIG_P2P u32 wfdielen = 0; #endif /* CONFIG_P2P */ -#ifdef CONFIG_INTEL_WIDI - u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 }; -#endif /* CONFIG_INTEL_WIDI */ - - /* DBG_871X("%s\n", __FUNCTION__); */ if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { @@ -4301,41 +4296,6 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) /* Value: */ wpsie[wpsielen++] = WPS_VERSION_1; /* Version 1.0 */ -#ifdef CONFIG_INTEL_WIDI - /* Commented by Kurt */ - /* Appended WiDi info. only if we did issued_probereq_widi(), and then we saved ven. ext. in pmlmepriv->sa_ext. */ - if( _rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == false - || pmlmepriv->num_p2p_sdt != 0 ) - { - /* Sec dev type */ - *(__be16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_SEC_DEV_TYPE_LIST ); - wpsielen += 2; - - /* Length: */ - *(__be16*) ( wpsie + wpsielen ) = cpu_to_be16( 0x0008 ); - wpsielen += 2; - - /* Value: */ - /* Category ID */ - *(__be16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_CID_DISPLAYS ); - wpsielen += 2; - - /* OUI */ - *(__be32*) ( wpsie + wpsielen ) = cpu_to_be32( INTEL_DEV_TYPE_OUI ); - wpsielen += 4; - - *(__be16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_SCID_WIDI_CONSUMER_SINK ); - wpsielen += 2; - - if( _rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == false ) - { - /* Vendor Extension */ - memcpy( wpsie + wpsielen, pmlmepriv->sa_ext, L2SDTA_SERVICE_VE_LEN ); - wpsielen += L2SDTA_SERVICE_VE_LEN; - } - } -#endif /* CONFIG_INTEL_WIDI */ - /* WiFi Simple Config State */ /* Type: */ *(__be16*) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_SIMPLE_CONF_STATE ); @@ -5010,15 +4970,6 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) result = process_p2p_group_negotation_req( pwdinfo, frame_body, len ); issue_p2p_GO_response( padapter, GetAddr2Ptr(pframe), frame_body, len, result ); -#ifdef CONFIG_INTEL_WIDI - if( (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_LISTEN) && (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_WFD_CONNECTION) ) - { - padapter->mlmepriv.widi_state = INTEL_WIDI_STATE_WFD_CONNECTION; - _cancel_timer_ex(&(padapter->mlmepriv.listen_timer)); - intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_STOP_WK, NULL); - } -#endif /* CONFIG_INTEL_WIDI */ - /* Commented by Albert 20110718 */ /* No matter negotiating or negotiation failure, the driver should set up the restore P2P state timer. */ _set_timer( &pwdinfo->restore_p2p_state_timer, 5000 ); @@ -5194,11 +5145,6 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) else { rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_DISMATCH ); - #ifdef CONFIG_INTEL_WIDI - memcpy( pwdinfo->p2p_peer_device_addr, group_id.go_device_addr , ETH_ALEN ); - rtw_p2p_set_role( pwdinfo, P2P_ROLE_CLIENT ); - #endif /* CONFIG_INTEL_WIDI */ - status_code = P2P_STATUS_FAIL_UNKNOWN_P2PGROUP; } } @@ -5256,14 +5202,6 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) issue_p2p_invitation_response( padapter, GetAddr2Ptr(pframe), pwdinfo->inviteresp_info.token, status_code ); _set_timer( &pwdinfo->restore_p2p_state_timer, 3000 ); } -#ifdef CONFIG_INTEL_WIDI - if( (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_LISTEN) && (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_WFD_CONNECTION) ) - { - padapter->mlmepriv.widi_state = INTEL_WIDI_STATE_WFD_CONNECTION; - _cancel_timer_ex(&(padapter->mlmepriv.listen_timer)); - intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_STOP_WK, NULL); - } -#endif /* CONFIG_INTEL_WIDI */ break; } case P2P_INVIT_RESP: @@ -5342,14 +5280,6 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) rtw_p2p_set_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ); _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_PROVISION_TIMEOUT ); -#ifdef CONFIG_INTEL_WIDI - if( (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_LISTEN) && (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_WFD_CONNECTION) ) - { - padapter->mlmepriv.widi_state = INTEL_WIDI_STATE_WFD_CONNECTION; - _cancel_timer_ex(&(padapter->mlmepriv.listen_timer)); - intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_STOP_WK, NULL); - } -#endif /* CONFIG_INTEL_WIDI */ break; case P2P_PROVISION_DISC_RESP: @@ -8623,14 +8553,6 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLA } } -#ifdef CONFIG_INTEL_WIDI - /* process_intel_widi_query_or_tigger(padapter, bssid); */ - if(process_intel_widi_query_or_tigger(padapter, bssid)) - { - return _FAIL; - } -#endif /* CONFIG_INTEL_WIDI */ - #if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) & 1 if(strcmp(bssid->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { DBG_871X("Receiving %s("MAC_FMT", DSConfig:%u) from ch%u with ss:%3u, sq:%3u, RawRSSI:%3ld\n" @@ -9766,10 +9688,6 @@ void linked_status_chk(struct adapter *padapter) /* Marked by Kurt 20130715 */ /* For WiDi 3.5 and latered on, they don't ask WiDi sink to do roaming, so we could not check rx limit that strictly. */ /* todo: To check why we under miracast session, rx_chk would be false */ - /* ifdef CONFIG_INTEL_WIDI */ - /* if (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_NONE) */ - /* rx_chk_limit = 1; */ - /* endif */ if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress)) != NULL) { diff --git a/core/rtw_p2p.c b/core/rtw_p2p.c index a08be30..ab47caa 100755 --- a/core/rtw_p2p.c +++ b/core/rtw_p2p.c @@ -1837,20 +1837,6 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 p2pie[ MAX_P2P_IE_LEN] = { 0x00 }; u32 len=0, p2pielen = 0; -#ifdef CONFIG_INTEL_WIDI - struct mlme_priv *pmlmepriv = &(pwdinfo->padapter->mlmepriv); - u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 }; - u8 widi_version = 0, i = 0; - - if( _rtw_memcmp( pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN ) == false ) - { - widi_version = 35; - } - else if( pmlmepriv->num_p2p_sdt != 0 ) - { - widi_version = 40; - } -#endif /* CONFIG_INTEL_WIDI */ /* P2P OUI */ p2pielen = 0; @@ -1937,17 +1923,6 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) /* 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) */ /* + 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( widi_version == 35 ) - { - RTW_PUT_LE16(p2pie + p2pielen, 21 + 8 + pwdinfo->device_name_len); - } - else if( widi_version == 40 ) - { - RTW_PUT_LE16(p2pie + p2pielen, 21 + 8 * pmlmepriv->num_p2p_sdt + pwdinfo->device_name_len); - } - else -#endif /* CONFIG_INTEL_WIDI */ RTW_PUT_LE16(p2pie + p2pielen, 21 + pwdinfo->device_name_len); p2pielen += 2; @@ -1962,77 +1937,20 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) RTW_PUT_BE16(p2pie + p2pielen, pwdinfo->supported_wps_cm); p2pielen += 2; -#ifdef CONFIG_INTEL_WIDI - if( widi_version == 40 ) - { - /* Primary Device Type */ - /* Category ID */ - /* u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); */ - RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_pdt_cid ); - p2pielen += 2; + /* Primary Device Type */ + /* Category ID */ + RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_CID_MULIT_MEDIA); + p2pielen += 2; - /* OUI */ - /* u32*) ( p2pie + p2pielen ) = cpu_to_be32( WPSOUI ); */ - RTW_PUT_BE32(p2pie + p2pielen, WPSOUI); - p2pielen += 4; + /* OUI */ + RTW_PUT_BE32(p2pie + p2pielen, WPSOUI); + p2pielen += 4; - /* Sub Category ID */ - /* u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); */ - RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_pdt_scid); - p2pielen += 2; - } - else -#endif /* CONFIG_INTEL_WIDI */ - { - /* Primary Device Type */ - /* Category ID */ - /* u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_CID_MULIT_MEDIA ); */ - RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_CID_MULIT_MEDIA); - p2pielen += 2; - - /* OUI */ - /* u32*) ( p2pie + p2pielen ) = cpu_to_be32( WPSOUI ); */ - RTW_PUT_BE32(p2pie + p2pielen, WPSOUI); - p2pielen += 4; - - /* Sub Category ID */ - /* u16*) ( p2pie + p2pielen ) = cpu_to_be16( WPS_PDT_SCID_MEDIA_SERVER ); */ - RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_SCID_MEDIA_SERVER); - p2pielen += 2; - } + /* Sub Category ID */ + RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_SCID_MEDIA_SERVER); + p2pielen += 2; /* Number of Secondary Device Types */ -#ifdef CONFIG_INTEL_WIDI - if( widi_version == 35 ) - { - p2pie[ p2pielen++ ] = 0x01; - - RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_CID_DISPLAYS); - p2pielen += 2; - - RTW_PUT_BE32(p2pie + p2pielen, INTEL_DEV_TYPE_OUI); - p2pielen += 4; - - RTW_PUT_BE16(p2pie + p2pielen, P2P_SCID_WIDI_CONSUMER_SINK); - p2pielen += 2; - } - else if( widi_version == 40 ) - { - p2pie[ p2pielen++ ] = pmlmepriv->num_p2p_sdt; - for( ; i < pmlmepriv->num_p2p_sdt; i++ ) - { - RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_sdt_cid[i]); - p2pielen += 2; - - RTW_PUT_BE32(p2pie + p2pielen, INTEL_DEV_TYPE_OUI); - p2pielen += 4; - - RTW_PUT_BE16(p2pie + p2pielen, pmlmepriv->p2p_sdt_scid[i]); - p2pielen += 2; - } - } - else -#endif /* CONFIG_INTEL_WIDI */ p2pie[ p2pielen++ ] = 0x00; /* No Secondary Device Type List */ /* Device Name */ @@ -4619,11 +4537,6 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role) } else if (role == P2P_ROLE_DISABLE) { -#ifdef CONFIG_INTEL_WIDI - if( padapter->mlmepriv.p2p_reject_disable == true ) - return ret; -#endif /* CONFIG_INTEL_WIDI */ - if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 ) wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = false; @@ -4656,10 +4569,6 @@ int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role) /* Restore to initial setting. */ update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode); -#ifdef CONFIG_INTEL_WIDI - rtw_reset_widi_info(padapter); -#endif /* CONFIG_INTEL_WIDI */ - /* For WiDi purpose. */ pwdinfo->driver_interface = DRIVER_CFG80211; } diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 6048324..9e29a79 100755 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -1780,11 +1780,6 @@ void update_tx_basic_rate(struct adapter *padapter, u8 wirelessmode) if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) return; #endif /* CONFIG_P2P */ -#ifdef CONFIG_INTEL_WIDI - if (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_NONE) - return; -#endif /* CONFIG_INTEL_WIDI */ - memset(supported_rates, 0, NDIS_802_11_LENGTH_RATES_EX); if ((wirelessmode & WIRELESS_11B) && (wirelessmode == WIRELESS_11B)) { diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h index 5aaaf1e..85bb9a2 100755 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -26,13 +26,7 @@ #include #include -#ifdef CONFIG_INTEL_WIDI -#include -#endif - #define MAX_BSS_CNT 128 -//#define MAX_JOIN_TIMEOUT 2000 -//#define MAX_JOIN_TIMEOUT 2500 #define MAX_JOIN_TIMEOUT 6500 // Commented by Albert 20101105 @@ -532,33 +526,6 @@ struct mlme_priv { _workitem Linkup_workitem; _workitem Linkdown_workitem; #endif - -#ifdef CONFIG_INTEL_WIDI - int widi_state; - int listen_state; - _timer listen_timer; - ATOMIC_T rx_probe_rsp; // 1:receive probe respone from RDS source. - u8 *l2sdTaBuffer; - u8 channel_idx; - u8 group_cnt; //In WiDi 3.5, they specified another scan algo. for WFD/RDS co-existed - u8 sa_ext[L2SDTA_SERVICE_VE_LEN]; - - u8 widi_enable; - /** - * For WiDi 4; upper layer would set - * p2p_primary_device_type_category_id - * p2p_primary_device_type_sub_category_id - * p2p_secondary_device_type_category_id - * p2p_secondary_device_type_sub_category_id - */ - u16 p2p_pdt_cid; - u16 p2p_pdt_scid; - u8 num_p2p_sdt; - u16 p2p_sdt_cid[MAX_NUM_P2P_SDT]; - u16 p2p_sdt_scid[MAX_NUM_P2P_SDT]; - u8 p2p_reject_disable; //When starting NL80211 wpa_supplicant/hostapd, it will call netdev_close - //such that it will cause p2p disabled. Use this flag to reject. -#endif // CONFIG_INTEL_WIDI }; #ifdef CONFIG_AP_MODE diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 841e0ee..3413d6b 100755 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -3506,14 +3506,9 @@ static int rtw_wps_start(struct net_device *dev, rtw_led_control(padapter, LED_CTL_STOP_WPS_FAIL); } -#ifdef CONFIG_INTEL_WIDI - process_intel_widi_wps_status(padapter, u32wps_start); -#endif /* CONFIG_INTEL_WIDI */ - exit: return ret; - } #ifdef CONFIG_P2P @@ -5168,20 +5163,10 @@ static int rtw_p2p_prov_disc(struct net_device *dev, DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); - if ( pwdinfo->p2p_state == P2P_STATE_NONE ) - { + if ( pwdinfo->p2p_state == P2P_STATE_NONE ) { DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); return ret; - } - else - { -#ifdef CONFIG_INTEL_WIDI - if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true){ - DBG_871X( "[%s] WiFi is under survey!\n", __FUNCTION__ ); - return ret; - } -#endif /* CONFIG_INTEL_WIDI */ - + } else { /* Reset the content of struct tx_provdisc_req_info excluded the wps_config_method_request. */ memset( pwdinfo->tx_prov_disc_info.peerDevAddr, 0x00, ETH_ALEN ); memset( pwdinfo->tx_prov_disc_info.peerIFAddr, 0x00, ETH_ALEN ); @@ -5192,9 +5177,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, } for( jj = 0, kk = 0; jj < ETH_ALEN; jj++, kk += 3 ) - { peerMAC[ jj ] = key_2char2num( extra[kk], extra[kk+ 1] ); - } if ( _rtw_memcmp( &extra[ 18 ], "display", 7 ) ) { @@ -5272,23 +5255,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, p2pie = rtw_get_p2p_ie(p2pie+p2pielen, pnetwork->network.IELength - ie_offset -(p2pie -&pnetwork->network.IEs[ie_offset] + p2pielen), NULL, &p2pielen); } } - -#ifdef CONFIG_INTEL_WIDI - /* Some Intel WiDi source may not provide P2P IE, */ - /* so we could only compare mac addr by 802.11 Source Address */ - if( pmlmepriv->widi_state == INTEL_WIDI_STATE_WFD_CONNECTION - && uintPeerChannel == 0 ) - { - if ( _rtw_memcmp( pnetwork->network.MacAddress, peerMAC, ETH_ALEN ) ) - { - uintPeerChannel = pnetwork->network.Configuration.DSConfig; - break; - } - } -#endif /* CONFIG_INTEL_WIDI */ - plist = get_next(plist); - } _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); @@ -5358,14 +5325,6 @@ static int rtw_p2p_prov_disc(struct net_device *dev, _set_timer( &pwdinfo->restore_p2p_state_timer, P2P_PROVISION_TIMEOUT ); } else { DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ ); -#ifdef CONFIG_INTEL_WIDI - rtw_p2p_set_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH); - rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); - rtw_free_network_queue(padapter, true); - _enter_critical_bh(&pmlmepriv->lock, &irqL); - rtw_sitesurvey_cmd(padapter, NULL, 0, NULL, 0); - _exit_critical_bh(&pmlmepriv->lock, &irqL); -#endif /* CONFIG_INTEL_WIDI */ } exit: @@ -9703,42 +9662,6 @@ static int rtw_tdls_get(struct net_device *dev, -#ifdef CONFIG_INTEL_WIDI -static int rtw_widi_set(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - int ret = 0; - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); - - process_intel_widi_cmd(padapter, extra); - - return ret; -} - -static int rtw_widi_set_probe_request(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - int ret = 0; - u8 *pbuf = NULL; - struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); - - pbuf = rtw_malloc(sizeof(l2_msg_t)); - if(pbuf) - { - copy_from_user(pbuf, wrqu->data.pointer, wrqu->data.length); - /* memcpy(pbuf, wrqu->data.pointer, wrqu->data.length); */ - - if( wrqu->data.flags == 0 ) - intel_widi_wk_cmd(padapter, INTEL_WIDI_ISSUE_PROB_WK, pbuf); - else if( wrqu->data.flags == 1 ) - rtw_set_wfd_rds_sink_info( padapter, (l2_msg_t *)pbuf ); - } - return ret; -} -#endif /* CONFIG_INTEL_WIDI */ - #ifdef CONFIG_MAC_LOOPBACK_DRIVER #include @@ -10469,17 +10392,6 @@ static const struct iw_priv_args rtw_private_args[] = { IW_PRIV_TYPE_CHAR | 40, IW_PRIV_TYPE_CHAR | 0x7FF, "test" }, -#ifdef CONFIG_INTEL_WIDI - { - SIOCIWFIRSTPRIV + 0x1E, - IW_PRIV_TYPE_CHAR | 1024, 0, "widi_set" - }, - { - SIOCIWFIRSTPRIV + 0x1F, - IW_PRIV_TYPE_CHAR | 128, 0, "widi_prob_req" - }, -#endif /* CONFIG_INTEL_WIDI */ - #ifdef CONFIG_WOWLAN { MP_WOW_ENABLE , IW_PRIV_TYPE_CHAR | 1024, 0, "wow_enable" }, /* set */ #endif @@ -10530,10 +10442,6 @@ static iw_handler rtw_private_handler[] = rtw_mp_efuse_get, /* 0x1B */ NULL, /* 0x1C is reserved for hostapd */ rtw_test, /* 0x1D */ -#ifdef CONFIG_INTEL_WIDI - rtw_widi_set, /* 0x1E */ - rtw_widi_set_probe_request, /* 0x1F */ -#endif /* CONFIG_INTEL_WIDI */ }; #if WIRELESS_EXT >= 17 diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index f107052..bece790 100755 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -363,10 +363,6 @@ static uint loadparam( struct adapter *padapter, _nic_hdl pnetdev) #endif registry_par->max_roaming_times = (u8)rtw_max_roaming_times; -#ifdef CONFIG_INTEL_WIDI - registry_par->max_roaming_times = (u8)rtw_max_roaming_times + 2; -#endif /* CONFIG_INTEL_WIDI */ - registry_par->fw_iol = rtw_fw_iol; #ifdef CONFIG_80211D @@ -947,15 +943,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter) rtw_hal_sreset_init(padapter); #endif -#ifdef CONFIG_INTEL_WIDI - if(rtw_init_intel_widi(padapter) == _FAIL) - { - DBG_871X("Can't rtw_init_intel_widi\n"); - ret8=_FAIL; - goto exit; - } -#endif /* CONFIG_INTEL_WIDI */ - #ifdef CONFIG_WAPI_SUPPORT padapter->WapiSupport = true; /* set true temp, will revise according to Efuse or Registry value later. */ rtw_wapi_init(padapter); @@ -1060,10 +1047,6 @@ u8 rtw_free_drv_sw(struct adapter *padapter) _rtw_spinlock_free(&padapter->br_ext_lock); #endif /* CONFIG_BR_EXT */ -#ifdef CONFIG_INTEL_WIDI - rtw_free_intel_widi(padapter); -#endif /* CONFIG_INTEL_WIDI */ - free_mlme_ext_priv(&padapter->mlmeextpriv); #ifdef CONFIG_TDLS