evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8723au: rtw_cmd.c: Remove last #ifdef CONFIG_8723AU_BT_COEXIST usage

Browse source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-05-25 22:43:32 +02:00 • committed by Greg Kroah-Hartman
parent a862d5d307
commit 09d8879195
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/staging/rtl8723au/core/rtw_cmd.c
View file

@ -21,10 +21,6 @@
#include <rtl8723a_cmd.h> #include <rtl8723a_cmd.h>
#include <rtw_sreset.h> #include <rtw_sreset.h>
#ifdef CONFIG_8723AU_BT_COEXIST
#include <rtl8723a_hal.h>
#endif /* CONFIG_8723AU_BT_COEXIST */
static struct cmd_hdl wlancmds[] = { static struct cmd_hdl wlancmds[] = {
GEN_DRV_CMD_HANDLER(0, NULL) /*0*/ GEN_DRV_CMD_HANDLER(0, NULL) /*0*/
GEN_DRV_CMD_HANDLER(0, NULL) GEN_DRV_CMD_HANDLER(0, NULL)
@ -950,25 +946,19 @@ static void traffic_status_watchdog(struct rtw_adapter *padapter)
u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false; u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false;
u8 bHigherBusyTxTraffic = false; u8 bHigherBusyTxTraffic = false;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#ifndef CONFIG_8723AU_BT_COEXIST
int BusyThreshold = 100; int BusyThreshold = 100;
#endif
/* */ /* */
/* Determine if our traffic is busy now */ /* Determine if our traffic is busy now */
/* */ /* */
if (check_fwstate(pmlmepriv, _FW_LINKED)) { if (check_fwstate(pmlmepriv, _FW_LINKED)) {
#ifdef CONFIG_8723AU_BT_COEXIST if (rtl8723a_BT_coexist(padapter))
if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 50 || BusyThreshold = 50;
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 50) else if (pmlmepriv->LinkDetectInfo.bBusyTraffic)
#else /* !CONFIG_8723AU_BT_COEXIST */ BusyThreshold = 75;
/* if we raise bBusyTraffic in last watchdog, using /* if we raise bBusyTraffic in last watchdog, using
lower threshold. */ lower threshold. */
if (pmlmepriv->LinkDetectInfo.bBusyTraffic)
BusyThreshold = 75;
if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold || if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold ||
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) {
#endif /* !CONFIG_8723AU_BT_COEXIST */
{
bBusyTraffic = true; bBusyTraffic = true;
if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod >