diff options
Diffstat (limited to 'drivers/staging/rtl8723bs/core/rtw_cmd.c')
-rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_cmd.c | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index ecaa769f12e6..addc55706a3c 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -8,6 +8,7 @@ #include <drv_types.h> #include <rtw_debug.h> +#include <hal_btcoex.h> #include <linux/jiffies.h> static struct _cmd_callback rtw_cmd_callback[] = { @@ -1439,7 +1440,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter) /* */ /* BT-Coexist */ /* */ - rtw_btcoex_Handler(padapter); + hal_btcoex_Handler(padapter); /* always call rtw_ps_processor() at last one. */ @@ -1462,7 +1463,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) switch (lps_ctrl_type) { case LPS_CTRL_SCAN: /* DBG_871X("LPS_CTRL_SCAN\n"); */ - rtw_btcoex_ScanNotify(padapter, true); + hal_btcoex_ScanNotify(padapter, true); if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { /* connect */ @@ -1491,7 +1492,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) case LPS_CTRL_SPECIAL_PACKET: /* DBG_871X("LPS_CTRL_SPECIAL_PACKET\n"); */ pwrpriv->DelayLPSLastTimeStamp = jiffies; - rtw_btcoex_SpecialPacketNotify(padapter, PACKET_DHCP); + hal_btcoex_SpecialPacketNotify(padapter, PACKET_DHCP); LPS_Leave(padapter, "LPS_CTRL_SPECIAL_PACKET"); break; case LPS_CTRL_LEAVE: @@ -1594,7 +1595,7 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim) if (dtim <= 0 || dtim > 16) return; - if (rtw_btcoex_IsBtControlLps(padapter) == true) + if (hal_btcoex_IsBtControlLps(padapter) == true) return; mutex_lock(&pwrpriv->lock); @@ -1660,22 +1661,6 @@ exit: } -static void power_saving_wk_hdl(struct adapter *padapter) -{ - rtw_ps_processor(padapter); -} - -/* add for CONFIG_IEEE80211W, none 11w can use it */ -static void reset_securitypriv_hdl(struct adapter *padapter) -{ - rtw_reset_securitypriv(padapter); -} - -static void free_assoc_resources_hdl(struct adapter *padapter) -{ - rtw_free_assoc_resources(padapter, 1); -} - u8 rtw_ps_cmd(struct adapter *padapter) { struct cmd_obj *ppscmd; @@ -1738,7 +1723,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter) pstapriv->tim_bitmap &= ~BIT(0); pstapriv->sta_dz_bitmap &= ~BIT(0); - if (update_tim == true) + if (update_tim) update_beacon(padapter, _TIM_IE_, NULL, true); } else {/* re check again */ rtw_chk_hi_queue_cmd(padapter); @@ -1844,7 +1829,7 @@ static void rtw_btinfo_hdl(struct adapter *adapter, u8 *buf, u16 buf_len) buf[1] = 0; else if (cmd_idx == BTINFO_BT_AUTO_RPT) buf[1] = 2; - rtw_btcoex_BtInfoNotify(adapter, len+1, &buf[1]); + hal_btcoex_BtInfoNotify(adapter, len+1, &buf[1]); } u8 rtw_c2h_packet_wk_cmd(struct adapter *padapter, u8 *pbuf, u16 length) @@ -1934,7 +1919,7 @@ static void c2h_wk_callback(_workitem *work) c2h_evt = rtw_malloc(16); if (c2h_evt != NULL) { /* This C2H event is not read, read & clear now */ - if (rtw_hal_c2h_evt_read(adapter, c2h_evt) != _SUCCESS) { + if (c2h_evt_read_88xx(adapter, c2h_evt) != _SUCCESS) { kfree(c2h_evt); continue; } @@ -1977,7 +1962,7 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf) dynamic_chk_wk_hdl(padapter); break; case POWER_SAVING_CTRL_WK_CID: - power_saving_wk_hdl(padapter); + rtw_ps_processor(padapter); break; case LPS_CTRL_WK_CID: lps_ctrl_wk_hdl(padapter, (u8)pdrvextra_cmd->type); @@ -1993,10 +1978,10 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf) break; /* add for CONFIG_IEEE80211W, none 11w can use it */ case RESET_SECURITYPRIV: - reset_securitypriv_hdl(padapter); + rtw_reset_securitypriv(padapter); break; case FREE_ASSOC_RESOURCES: - free_assoc_resources_hdl(padapter); + rtw_free_assoc_resources(padapter, 1); break; case C2H_WK_CID: rtw_hal_set_hwreg_with_buf(padapter, HW_VAR_C2H_HANDLE, pdrvextra_cmd->pbuf, pdrvextra_cmd->size); |