diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-05-25 22:43:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-25 15:14:43 -0700 |
| commit | f83e9e2a1359eea10caf04c3ea2dfd8d6f59d9df (patch) | |
| tree | 39bdad06b4eff2aa6cdabc51796fad994839ca83 /drivers/staging/rtl8723au | |
| parent | 43de03040998e98d8703b48dd0bf7705b649dfae (diff) | |
staging: rtl8723au: Rename BTDM_ForDhcp() to rtl8723a_BT_specialpacket_notify()
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723au')
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_cmd.c | 8 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 7 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h | 4 |
3 files changed, 6 insertions, 13 deletions
diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c index c89a19c391db..0f837fa3820e 100644 --- a/drivers/staging/rtl8723au/core/rtw_cmd.c +++ b/drivers/staging/rtl8723au/core/rtw_cmd.c @@ -1083,13 +1083,9 @@ static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type) break; case LPS_CTRL_SPECIAL_PACKET: pwrpriv->DelayLPSLastTimeStamp = jiffies; -#ifdef CONFIG_8723AU_BT_COEXIST - BT_SpecialPacketNotify(padapter); - if (rtl8723a_BT_using_antenna_1(padapter) == false) -#endif - { + rtl8723a_BT_specialpacket_notify(padapter); + if (!rtl8723a_BT_using_antenna_1(padapter)) LPS_Leave23a(padapter); - } break; case LPS_CTRL_LEAVE: #ifdef CONFIG_8723AU_BT_COEXIST diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c index dbaa7c497978..f00313b9cc89 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c @@ -156,11 +156,6 @@ void BT_WifiAssociateNotify(struct rtw_adapter *padapter, u8 action) BTDM_WifiAssociateNotify(padapter, action); } -void BT_SpecialPacketNotify(struct rtw_adapter *padapter) -{ - BTDM_ForDhcp(padapter); -} - void BT_HaltProcess(struct rtw_adapter *padapter) { BTDM_ForHalt(padapter); @@ -11007,7 +11002,7 @@ void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter, BTDM_MediaStatusNotify8723A(padapter, mstatus); } -void BTDM_ForDhcp(struct rtw_adapter *padapter) +void rtl8723a_BT_specialpacket_notify(struct rtw_adapter *padapter) { if (!rtl8723a_BT_coexist(padapter)) return; diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h index 7ef59a21d249..52e17329bc48 100644 --- a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h +++ b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h @@ -27,6 +27,7 @@ void rtl8723a_BT_do_coexist(struct rtw_adapter *padapter); void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType); void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter, enum rt_media_status mstatus); +void rtl8723a_BT_specialpacket_notify(struct rtw_adapter *padapter); #else static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter) { @@ -40,9 +41,10 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter) { return false; } -#define rtl8723a_BT_do_coexist(padapter) do {} while(0) +#define rtl8723a_BT_do_coexist(padapter) do {} while(0) #define rtl8723a_BT_wifiscan_notify(padapter, scanType) do {} while(0) #define rtl8723a_BT_mediastatus_notify(padapter, mstatus) do {} while(0) +#define rtl8723a_BT_specialpacket_notify(padapter) do {} while(0) #endif #endif |