diff options
Diffstat (limited to 'drivers/staging/rtl8723bs/include')
-rw-r--r-- | drivers/staging/rtl8723bs/include/drv_types.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/hal_btcoex.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/hal_com.h | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/hal_intf.h | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/ieee80211.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/osdep_intf.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/osdep_service.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/recv_osdep.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_ap.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_btcoex.h | 28 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_mlme.h | 3 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/include/sdio_ops.h | 2 |
13 files changed, 11 insertions, 46 deletions
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h index 0fd84c93e72b..96346ce064aa 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -673,7 +673,7 @@ int rtw_config_gpio(struct net_device *netdev, int gpio_num, bool isOutput); #endif #ifdef CONFIG_WOWLAN -int rtw_suspend_wow(struct adapter *padapter); +void rtw_suspend_wow(struct adapter *padapter); int rtw_resume_process_wow(struct adapter *padapter); #endif diff --git a/drivers/staging/rtl8723bs/include/hal_btcoex.h b/drivers/staging/rtl8723bs/include/hal_btcoex.h index 4066b0a1450c..6f7514be998f 100644 --- a/drivers/staging/rtl8723bs/include/hal_btcoex.h +++ b/drivers/staging/rtl8723bs/include/hal_btcoex.h @@ -23,7 +23,7 @@ void DBG_BT_INFO(u8 *dbgmsg); void hal_btcoex_SetBTCoexist(struct adapter *padapter, u8 bBtExist); u8 hal_btcoex_IsBtExist(struct adapter *padapter); -u8 hal_btcoex_IsBtDisabled(struct adapter *); +bool hal_btcoex_IsBtDisabled(struct adapter *); void hal_btcoex_SetChipType(struct adapter *padapter, u8 chipType); void hal_btcoex_SetPgAntNum(struct adapter *padapter, u8 antNum); void hal_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath); @@ -43,7 +43,7 @@ void hal_btcoex_BtInfoNotify(struct adapter *padapter, u8 length, u8 *tmpBuf); void hal_btcoex_SuspendNotify(struct adapter *padapter, u8 state); void hal_btcoex_HaltNotify(struct adapter *padapter); -void hal_btcoex_Hanlder(struct adapter *padapter); +void hal_btcoex_Handler(struct adapter *padapter); s32 hal_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *padapter); void hal_btcoex_SetManualControl(struct adapter *padapter, u8 bmanual); diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h index d1c5b3193043..f5c3ce5da70c 100644 --- a/drivers/staging/rtl8723bs/include/hal_com.h +++ b/drivers/staging/rtl8723bs/include/hal_com.h @@ -232,7 +232,6 @@ void rtw_init_hal_com_default_value(struct adapter * Adapter); void c2h_evt_clear(struct adapter *adapter); s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf); -u8 rtw_hal_networktype_to_raid(struct adapter *adapter, struct sta_info *psta); u8 rtw_get_mgntframe_raid(struct adapter *adapter, unsigned char network_type); void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *psta); diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h index 19ceb4aa753e..3a0c3d079d50 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -388,7 +388,6 @@ void rtw_hal_notch_filter(struct adapter * adapter, bool enable); void rtw_hal_reset_security_engine(struct adapter * adapter); bool rtw_hal_c2h_valid(struct adapter *adapter, u8 *buf); -s32 rtw_hal_c2h_evt_read(struct adapter *adapter, u8 *buf); s32 rtw_hal_c2h_handler(struct adapter *adapter, u8 *c2h_evt); c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter); diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h index 74c028fbe8f7..2110552b8e59 100644 --- a/drivers/staging/rtl8723bs/include/ieee80211.h +++ b/drivers/staging/rtl8723bs/include/ieee80211.h @@ -1138,7 +1138,7 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len); int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x); int rtw_parse_wpa2_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x); -int rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie, u16 *wpa_len); +void rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie, u16 *wpa_len); u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen); u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen); diff --git a/drivers/staging/rtl8723bs/include/osdep_intf.h b/drivers/staging/rtl8723bs/include/osdep_intf.h index 0ea91a111da3..40313d17a242 100644 --- a/drivers/staging/rtl8723bs/include/osdep_intf.h +++ b/drivers/staging/rtl8723bs/include/osdep_intf.h @@ -46,7 +46,7 @@ void devobj_deinit(struct dvobj_priv *pdvobj); u8 rtw_init_drv_sw(struct adapter *padapter); u8 rtw_free_drv_sw(struct adapter *padapter); -u8 rtw_reset_drv_sw(struct adapter *padapter); +void rtw_reset_drv_sw(struct adapter *padapter); void rtw_dev_unload(struct adapter *padapter); u32 rtw_start_drv_threads(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/osdep_service.h b/drivers/staging/rtl8723bs/include/osdep_service.h index 76d619585046..d2616af95ffa 100644 --- a/drivers/staging/rtl8723bs/include/osdep_service.h +++ b/drivers/staging/rtl8723bs/include/osdep_service.h @@ -178,8 +178,6 @@ extern int rtw_retrive_from_file(char *path, u8 *buf, u32 sz); extern void rtw_free_netdev(struct net_device * netdev); -extern u64 rtw_modular64(u64 x, u64 y); - /* Macros for handling unaligned memory accesses */ #define RTW_GET_BE16(a) ((u16) (((a)[0] << 8) | (a)[1])) diff --git a/drivers/staging/rtl8723bs/include/recv_osdep.h b/drivers/staging/rtl8723bs/include/recv_osdep.h index 6fea0e948271..1056f615d0f9 100644 --- a/drivers/staging/rtl8723bs/include/recv_osdep.h +++ b/drivers/staging/rtl8723bs/include/recv_osdep.h @@ -22,14 +22,14 @@ int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter); void rtw_free_recv_priv (struct recv_priv *precvpriv); -int rtw_os_recv_resource_alloc(struct adapter *padapter, union recv_frame *precvframe); +void rtw_os_recv_resource_alloc(struct adapter *padapter, union recv_frame *precvframe); void rtw_os_recv_resource_free(struct recv_priv *precvpriv); void rtw_os_free_recvframe(union recv_frame *precvframe); -int rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf); +void rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf); _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8 *pdata); void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt_attrib *pattrib); diff --git a/drivers/staging/rtl8723bs/include/rtw_ap.h b/drivers/staging/rtl8723bs/include/rtw_ap.h index fd56c9db16a9..4a1ed9eff83a 100644 --- a/drivers/staging/rtl8723bs/include/rtw_ap.h +++ b/drivers/staging/rtl8723bs/include/rtw_ap.h @@ -19,7 +19,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len); void rtw_ap_restore_network(struct adapter *padapter); void rtw_set_macaddr_acl(struct adapter *padapter, int mode); int rtw_acl_add_sta(struct adapter *padapter, u8 *addr); -int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr); +void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr); u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta); int rtw_ap_set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid); @@ -31,7 +31,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta); void sta_info_update(struct adapter *padapter, struct sta_info *psta); void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta); u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason); -int rtw_sta_flush(struct adapter *padapter); +void rtw_sta_flush(struct adapter *padapter); void start_ap_mode(struct adapter *padapter); void stop_ap_mode(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h index 53f49c6b2fcd..19764c80b8ba 100644 --- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h +++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h @@ -15,36 +15,8 @@ #define PACKET_ARP 2 #define PACKET_EAPOL 3 -void rtw_btcoex_Initialize(struct adapter *); -void rtw_btcoex_PowerOnSetting(struct adapter *padapter); -void rtw_btcoex_HAL_Initialize(struct adapter *padapter, u8 bWifiOnly); -void rtw_btcoex_IpsNotify(struct adapter *, u8 type); -void rtw_btcoex_LpsNotify(struct adapter *, u8 type); -void rtw_btcoex_ScanNotify(struct adapter *, u8 type); -void rtw_btcoex_ConnectNotify(struct adapter *, u8 action); void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus); -void rtw_btcoex_SpecialPacketNotify(struct adapter *, u8 pktType); -void rtw_btcoex_IQKNotify(struct adapter *padapter, u8 state); -void rtw_btcoex_BtInfoNotify(struct adapter *, u8 length, u8 *tmpBuf); -void rtw_btcoex_SuspendNotify(struct adapter *, u8 state); void rtw_btcoex_HaltNotify(struct adapter *); -u8 rtw_btcoex_IsBtDisabled(struct adapter *); -void rtw_btcoex_Handler(struct adapter *); -s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *); -void rtw_btcoex_SetManualControl(struct adapter *, u8 bmanual); -u8 rtw_btcoex_IsBtControlLps(struct adapter *); -u8 rtw_btcoex_IsLpsOn(struct adapter *); -u8 rtw_btcoex_RpwmVal(struct adapter *); -u8 rtw_btcoex_LpsVal(struct adapter *); -void rtw_btcoex_SetBTCoexist(struct adapter *, u8 bBtExist); -void rtw_btcoex_SetChipType(struct adapter *, u8 chipType); -void rtw_btcoex_SetPGAntNum(struct adapter *, u8 antNum); -void rtw_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath); -u32 rtw_btcoex_GetRaMask(struct adapter *); -void rtw_btcoex_RecordPwrMode(struct adapter *, u8 *pCmdBuf, u8 cmdLen); -void rtw_btcoex_DisplayBtCoexInfo(struct adapter *, u8 *pbuf, u32 bufsize); -void rtw_btcoex_SetDBG(struct adapter *, u32 *pDbgModule); -u32 rtw_btcoex_GetDBG(struct adapter *, u8 *pStrBuf, u32 bufSize); /* ================================================== */ /* Below Functions are called by BT-Coex */ diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index 2693b554f414..d3c07d1c36e9 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -589,7 +589,6 @@ extern void rtw_scan_timeout_handler(struct timer_list *t); extern void rtw_dynamic_check_timer_handler(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); void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); @@ -607,8 +606,6 @@ extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_ne extern struct wlan_network* _rtw_find_network(struct __queue *scanned_queue, u8 *addr); -extern void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall); - extern sint rtw_if_up(struct adapter *padapter); sint rtw_linked_check(struct adapter *padapter); diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index f6eabad4bbe0..733bb9425448 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -544,7 +544,7 @@ extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); /* void fill_fwpriv(struct adapter *padapter, struct fw_priv *pfwpriv); */ -unsigned char networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta); +u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta); void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrate_len); void set_mcs_rate_by_mask(u8 *mcs_set, u32 mask); diff --git a/drivers/staging/rtl8723bs/include/sdio_ops.h b/drivers/staging/rtl8723bs/include/sdio_ops.h index 0f117ff1fbbe..6b0446be6d19 100644 --- a/drivers/staging/rtl8723bs/include/sdio_ops.h +++ b/drivers/staging/rtl8723bs/include/sdio_ops.h @@ -33,7 +33,7 @@ extern void InitSysInterrupt8723BSdio(struct adapter *padapter); extern void EnableInterrupt8723BSdio(struct adapter *padapter); extern void DisableInterrupt8723BSdio(struct adapter *padapter); extern u8 HalQueryTxBufferStatus8723BSdio(struct adapter *padapter); -extern u8 HalQueryTxOQTBufferStatus8723BSdio(struct adapter *padapter); +extern void HalQueryTxOQTBufferStatus8723BSdio(struct adapter *padapter); #if defined(CONFIG_WOWLAN) || defined(CONFIG_AP_WOWLAN) extern void ClearInterrupt8723BSdio(struct adapter *padapter); #endif /* CONFIG_WOWLAN */ |