From 549cb92f4736aebfaaf4e628de23c130f880927a Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 17 Aug 2015 10:11:05 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_INTEL_PROXIM Signed-off-by: Larry Finger --- core/rtw_pwrctrl.c | 7 --- core/rtw_recv.c | 51 --------------------- hal/rtl8188eu_xmit.c | 23 ++-------- hal/usb_halinit.c | 8 ---- include/drv_types.h | 19 -------- include/rtw_mlme.h | 102 +++++++++++++++++++----------------------- include/rtw_pwrctrl.h | 4 -- include/usb_hal.h | 3 -- os_dep/usb_intf.c | 23 ---------- 9 files changed, 50 insertions(+), 190 deletions(-) diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index 63d8a01..8a37cd2 100644 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -173,13 +173,6 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter) if (adapter->registrypriv.mp_mode == 1) goto exit; #endif - -#ifdef CONFIG_INTEL_PROXIM - if (adapter->proximity.proxim_on ==true) { - return; - } -#endif - if (pxmit_priv->free_xmitbuf_cnt != NR_XMITBUFF || pxmit_priv->free_xmit_extbuf_cnt != NR_XMIT_EXTBUFF) { DBG_88E_LEVEL(_drv_always_, "There are some pkts to transmit\n"); diff --git a/core/rtw_recv.c b/core/rtw_recv.c index d2ea507..5204482 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -1394,60 +1394,9 @@ sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_ } } } - -#ifdef CONFIG_INTEL_PROXIM - if (padapter->proximity.proxim_on ==true) - { - struct rx_pkt_attrib * pattrib =&precv_frame->u.hdr.attrib; - struct recv_stat* prxstat =( struct recv_stat * ) precv_frame->u.hdr.rx_head ; - u8 * pda,*psa,*pbssid,*ptr; - ptr =precv_frame->u.hdr.rx_data; - pda = get_da(ptr); - psa = get_sa(ptr); - pbssid = get_hdr_bssid(ptr); - - memcpy(pattrib->dst, pda, ETH_ALEN); - memcpy(pattrib->src, psa, ETH_ALEN); - - memcpy(pattrib->bssid, pbssid, ETH_ALEN); - - switch (pattrib->to_fr_ds) - { - case 0: - memcpy(pattrib->ra, pda, ETH_ALEN); - memcpy(pattrib->ta, psa, ETH_ALEN); - break; - - case 1: - memcpy(pattrib->ra, pda, ETH_ALEN); - memcpy(pattrib->ta, pbssid, ETH_ALEN); - break; - - case 2: - memcpy(pattrib->ra, pbssid, ETH_ALEN); - memcpy(pattrib->ta, psa, ETH_ALEN); - break; - - case 3: - memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN); - memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN); - RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" case 3\n")); - break; - - default: - break; - - } - pattrib->priority =0; - pattrib->hdrlen = pattrib->to_fr_ds ==3 ? 30 : 24; - - padapter->proximity.proxim_rx(padapter, precv_frame); - } -#endif mgt_dispatcher(padapter, precv_frame); return _SUCCESS; - } sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame); diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index e128c11..185d3bf 100644 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -383,23 +383,10 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag else ptxdesc->txdw5 |= cpu_to_le32(0x00300000);/* retry limit = 12 */ -#ifdef CONFIG_INTEL_PROXIM - if ((padapter->proximity.proxim_on==true)&&(pattrib->intel_proxim==true)) { - DBG_88E("\n %s pattrib->rate=%d\n",__FUNCTION__,pattrib->rate); - ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate); - } - else -#endif - { - ptxdesc->txdw5 |= cpu_to_le32(MRateToHwRate(pmlmeext->tx_rate)); - } - } - else if ((pxmitframe->frame_tag&0x0f) == TXAGG_FRAMETAG) - { + ptxdesc->txdw5 |= cpu_to_le32(MRateToHwRate(pmlmeext->tx_rate)); + } else if ((pxmitframe->frame_tag&0x0f) == TXAGG_FRAMETAG) { DBG_8192C("pxmitframe->frame_tag == TXAGG_FRAMETAG\n"); - } - else - { + } else { DBG_8192C("pxmitframe->frame_tag = %d\n", pxmitframe->frame_tag); /* offset 4 */ @@ -424,8 +411,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag /* (2) Enable HW SEQ control for beacon packet, because we use Hw beacon. */ /* (3) Use HW Qos SEQ to control the seq num of Ext port non-Qos packets. */ /* 2010.06.23. Added by tynli. */ - if (!pattrib->qos_en) - { + if (!pattrib->qos_en) { ptxdesc->txdw3 |= cpu_to_le32(EN_HWSEQ); /* Hw set sequence number */ ptxdesc->txdw4 |= cpu_to_le32(HW_SSN); /* Hw set sequence number */ } @@ -435,7 +421,6 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag rtl8188eu_cal_txdesc_chksum(ptxdesc); _dbg_dump_tx_info(padapter,pxmitframe->frame_tag,ptxdesc); return pull; - } /* for non-agg data frame or management frame */ diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 7fadd9a..7426fac 100644 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -3223,14 +3223,6 @@ static void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rss mask |= ((raid<<28)&0xf0000000); DBG_88E("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg); psta->ra_mask=mask; -#ifdef CONFIG_INTEL_PROXIM - if (padapter->proximity.proxim_on ==true) { - arg &= ~BIT(6); - } - else { - arg |= BIT(6); - } -#endif /* CONFIG_INTEL_PROXIM */ mask |= ((raid<<28)&0xf0000000); /* to do */ diff --git a/include/drv_types.h b/include/drv_types.h index dde0419..56ad644 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -279,18 +279,6 @@ typedef enum _DRIVER_STATE{ DRIVER_REPLACE_DONGLE = 2, }DRIVER_STATE; -#ifdef CONFIG_INTEL_PROXIM -struct proxim { - bool proxim_support; - bool proxim_on; - - void *proximity_priv; - int (*proxim_rx)(struct adapter *padapter, - union recv_frame *precv_frame); - u8 (*proxim_get_var)(struct adapter* padapter, u8 type); -}; -#endif /* CONFIG_INTEL_PROXIM */ - #ifdef CONFIG_MAC_LOOPBACK_DRIVER typedef struct loopbackdata { @@ -437,13 +425,6 @@ struct adapter { struct br_ext_info ethBrExtInfo; #endif /* CONFIG_BR_EXT */ -#ifdef CONFIG_INTEL_PROXIM - /* intel Proximity, should be alloc mem - * in intel Proximity module and can only - * be used in intel Proximity mode */ - struct proxim proximity; -#endif /* CONFIG_INTEL_PROXIM */ - #ifdef CONFIG_MAC_LOOPBACK_DRIVER PLOOPBACKDATA ploopback; #endif diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h index be816fb..d8cd061 100644 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -519,33 +519,33 @@ struct hostapd_priv }; -extern int hostapd_mode_init(struct adapter *padapter); -extern void hostapd_mode_unload(struct adapter *padapter); +int hostapd_mode_init(struct adapter *padapter); +void hostapd_mode_unload(struct adapter *padapter); #endif -extern void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf); -extern void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_atimdone_event_callback(struct adapter *adapter, u8 *pbuf); -extern void rtw_cpwm_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf); +void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_atimdone_event_callback(struct adapter *adapter, u8 *pbuf); +void rtw_cpwm_event_callback(struct adapter *adapter, u8 *pbuf); -extern int event_thread(void *context); -extern void rtw_join_timeout_handler(void* FunctionContext); -extern void _rtw_scan_timeout_handler(void* FunctionContext); +int event_thread(void *context); +void rtw_join_timeout_handler(void* FunctionContext); +void _rtw_scan_timeout_handler(void* FunctionContext); -extern void rtw_free_network_queue(struct adapter *adapter,u8 isfreeall); -extern int rtw_init_mlme_priv(struct adapter *adapter);/* (struct mlme_priv *pmlmepriv); */ +void rtw_free_network_queue(struct adapter *adapter,u8 isfreeall); +int rtw_init_mlme_priv(struct adapter *adapter);/* (struct mlme_priv *pmlmepriv); */ -extern void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv); +void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv); -extern sint rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); -extern sint rtw_set_key(struct adapter *adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx, bool enqueue); -extern sint rtw_set_auth(struct adapter *adapter,struct security_priv *psecuritypriv); +sint rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); +sint rtw_set_key(struct adapter *adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx, bool enqueue); +sint rtw_set_auth(struct adapter *adapter,struct security_priv *psecuritypriv); __inline static u8 *get_bssid(struct mlme_priv *pmlmepriv) { /* if sta_mode:pmlmepriv->cur_network.network.MacAddress=> bssid */ @@ -631,70 +631,67 @@ __inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint v spin_unlock_bh(&pmlmepriv->lock); } -extern u16 rtw_get_capability(struct wlan_bssid_ex *bss); -extern void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target); -extern void rtw_disconnect_hdl_under_linked(struct adapter* adapter, struct sta_info *psta, u8 free_assoc); -extern void rtw_generate_random_ibss(u8 *pibss); -extern struct wlan_network* rtw_find_network(struct __queue *scanned_queue, u8 *addr); -extern struct wlan_network* rtw_get_oldest_wlan_network(struct __queue *scanned_queue); +u16 rtw_get_capability(struct wlan_bssid_ex *bss); +void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target); +void rtw_disconnect_hdl_under_linked(struct adapter* adapter, struct sta_info *psta, u8 free_assoc); +void rtw_generate_random_ibss(u8 *pibss); +struct wlan_network* rtw_find_network(struct __queue *scanned_queue, u8 *addr); +struct wlan_network* rtw_get_oldest_wlan_network(struct __queue *scanned_queue); -extern void rtw_free_assoc_resources(struct adapter* adapter, int lock_scanned_queue); -extern void rtw_indicate_disconnect(struct adapter* adapter); -extern void rtw_indicate_connect(struct adapter* adapter); +void rtw_free_assoc_resources(struct adapter* adapter, int lock_scanned_queue); +void rtw_indicate_disconnect(struct adapter* adapter); +void rtw_indicate_connect(struct adapter* adapter); void rtw_indicate_scan_done( struct adapter *padapter, bool aborted); void rtw_scan_abort(struct adapter *adapter); -extern int rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len); -extern int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len); -extern void rtw_init_registrypriv_dev_network(struct adapter *adapter); +int rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len); +int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len); +void rtw_init_registrypriv_dev_network(struct adapter *adapter); -extern void rtw_update_registrypriv_dev_network(struct adapter *adapter); +void rtw_update_registrypriv_dev_network(struct adapter *adapter); -extern void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter); +void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter); -extern void _rtw_join_timeout_handler(struct adapter *adapter); -extern void rtw_scan_timeout_handler(struct adapter *adapter); +void _rtw_join_timeout_handler(struct adapter *adapter); +void rtw_scan_timeout_handler(struct adapter *adapter); -extern void rtw_dynamic_check_timer_handlder(struct adapter *adapter); +void rtw_dynamic_check_timer_handlder(struct adapter *adapter); bool rtw_is_scan_deny(struct adapter *adapter); void rtw_clear_scan_deny(struct adapter *adapter); void rtw_set_scan_deny_timer_hdl(struct adapter *adapter); void rtw_set_scan_deny(struct adapter *adapter, u32 ms); -extern int _rtw_init_mlme_priv(struct adapter *padapter); +int _rtw_init_mlme_priv(struct adapter *padapter); void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall); -extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); +void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); -extern int _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork); +int _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork); -extern struct wlan_network* _rtw_dequeue_network(struct __queue *queue); +struct wlan_network* _rtw_dequeue_network(struct __queue *queue); -extern struct wlan_network* _rtw_alloc_network(struct mlme_priv *pmlmepriv); +struct wlan_network* _rtw_alloc_network(struct mlme_priv *pmlmepriv); -extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall); -extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork); +void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall); +void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork); -extern struct wlan_network* _rtw_find_network(struct __queue *scanned_queue, u8 *addr); +struct wlan_network* _rtw_find_network(struct __queue *scanned_queue, u8 *addr); -extern void _rtw_free_network_queue(struct adapter* padapter, u8 isfreeall); +void _rtw_free_network_queue(struct adapter* padapter, u8 isfreeall); -extern sint rtw_if_up(struct adapter *padapter); +sint rtw_if_up(struct adapter *padapter); sint rtw_linked_check(struct adapter *padapter); u8 *rtw_get_capability_from_ie(u8 *ie); u8 *rtw_get_timestampe_from_ie(u8 *ie); u8 *rtw_get_beacon_interval_from_ie(u8 *ie); - - void rtw_joinbss_reset(struct adapter *padapter); - unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len); void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len); void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitframe); @@ -706,13 +703,6 @@ void _rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network); void rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network); void rtw_set_roaming(struct adapter *adapter, u8 to_roaming); u8 rtw_to_roaming(struct adapter *adapter); - void rtw_sta_media_status_rpt(struct adapter *adapter,struct sta_info *psta, u32 mstatus); -#ifdef CONFIG_INTEL_PROXIM -void rtw_proxim_enable(struct adapter *padapter); -void rtw_proxim_disable(struct adapter *padapter); -void rtw_proxim_send_packet(struct adapter *padapter,u8 *pbuf,u16 len,u8 hw_rate); -#endif /* CONFIG_INTEL_PROXIM */ - #endif /* __RTL871X_MLME_H_ */ diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h index fe56c56..5cbcd6b 100644 --- a/include/rtw_pwrctrl.h +++ b/include/rtw_pwrctrl.h @@ -254,10 +254,6 @@ struct pwrctrl_priv android_early_suspend_t early_suspend; u8 do_late_resume; #endif - - #ifdef CONFIG_INTEL_PROXIM - u8 stored_power_mgnt; - #endif }; #define rtw_get_ips_mode_req(pwrctl) \ diff --git a/include/usb_hal.h b/include/usb_hal.h index 2b2b366..39eabe8 100644 --- a/include/usb_hal.h +++ b/include/usb_hal.h @@ -23,7 +23,4 @@ void rtl8188eu_set_hal_ops(struct adapter * padapter); #define hal_set_hal_ops rtl8188eu_set_hal_ops -#ifdef CONFIG_INTEL_PROXIM -extern struct adapter *rtw_usb_get_sw_pointer(void); -#endif /* CONFIG_INTEL_PROXIM */ #endif /* __USB_HAL_H__ */ diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index 59bf996..a9a2d3f 100644 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -1229,11 +1229,6 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device DBG_88E("rtw_init_primary_adapter Failed!\n"); goto free_dvobj; } - -#ifdef CONFIG_INTEL_PROXIM - rtw_sw_export=if1; -#endif - if (ui_pid[1]!=0) { DBG_88E("ui_pid[1]:%d\n",ui_pid[1]); rtw_signal_process(ui_pid[1], SIGUSR2); @@ -1301,16 +1296,6 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf) RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-dev_remove()\n")); DBG_88E("-r871xu_dev_remove, done\n"); - - -#ifdef CONFIG_INTEL_PROXIM - rtw_sw_export= NULL; -#endif - -; - - return; - } #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) extern int console_suspend_enabled; @@ -1346,11 +1331,3 @@ static void __exit rtw_drv_halt(void) module_init(rtw_drv_entry); module_exit(rtw_drv_halt); - -#ifdef CONFIG_INTEL_PROXIM -struct adapter *rtw_usb_get_sw_pointer(void) -{ - return rtw_sw_export; -} -EXPORT_SYMBOL(rtw_usb_get_sw_pointer); -#endif /* CONFIG_INTEL_PROXIM */