redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: rtl8723au: Call c2h_handler_8723a() directly instead of via HAL interface

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-09 15:04:12 +02:00 committed by Greg Kroah-Hartman
parent 227ca8c4c4
commit 00cf86c997
5 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1307,10 +1307,10 @@ static int c2h_evt_hdl(struct rtw_adapter *adapter, struct c2h_evt_hdr *c2h_evt)
if (c2h_evt_read23a(adapter, buf) == _SUCCESS) { if (c2h_evt_read23a(adapter, buf) == _SUCCESS) {
c2h_evt = (struct c2h_evt_hdr *)buf; c2h_evt = (struct c2h_evt_hdr *)buf;
ret = rtw_hal_c2h_handler23a(adapter, c2h_evt); ret = c2h_handler_8723a(adapter, c2h_evt);
} }
} else } else
ret = rtw_hal_c2h_handler23a(adapter, c2h_evt); ret = c2h_handler_8723a(adapter, c2h_evt);
return ret; return ret;
} }
@ -1343,7 +1343,7 @@ void rtw_evt_work(struct work_struct *work)
if (c2h_id_filter_ccx_8723a(ework->u.c2h_evt.id) == true) { if (c2h_id_filter_ccx_8723a(ework->u.c2h_evt.id) == true) {
/* Handle CCX report here */ /* Handle CCX report here */
rtw_hal_c2h_handler23a(adapter, &ework->u.c2h_evt); c2h_handler_8723a(adapter, &ework->u.c2h_evt);
kfree(ework); kfree(ework);
} else { } else {
/* /*

8
drivers/staging/rtl8723au/hal/hal_intf.c
View file

@ -360,11 +360,3 @@ void rtw_hal_reset_security_engine23a(struct rtw_adapter *adapter)
if (adapter->HalFunc.hal_reset_security_engine) if (adapter->HalFunc.hal_reset_security_engine)
adapter->HalFunc.hal_reset_security_engine(adapter); adapter->HalFunc.hal_reset_security_engine(adapter);
} }
s32 rtw_hal_c2h_handler23a(struct rtw_adapter *adapter, struct c2h_evt_hdr *c2h_evt)
{
s32 ret = _FAIL;
if (adapter->HalFunc.c2h_handler)
ret = adapter->HalFunc.c2h_handler(adapter, c2h_evt);
return ret;
}

5
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
View file

@ -1661,8 +1661,7 @@ s32 c2h_id_filter_ccx_8723a(u8 id)
return ret; return ret;
} }
static s32 c2h_handler_8723a(struct rtw_adapter *padapter, s32 c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt)
struct c2h_evt_hdr *c2h_evt)
{ {
s32 ret = _SUCCESS; s32 ret = _SUCCESS;
u8 i = 0; u8 i = 0;
@ -1764,8 +1763,6 @@ void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->SetHalODMVarHandler = &rtl8723a_SetHalODMVar; pHalFunc->SetHalODMVarHandler = &rtl8723a_SetHalODMVar;
pHalFunc->hal_notch_filter = &hal_notch_filter_8723a; pHalFunc->hal_notch_filter = &hal_notch_filter_8723a;
pHalFunc->c2h_handler = c2h_handler_8723a;
} }
void rtl8723a_InitAntenna_Selection(struct rtw_adapter *padapter) void rtl8723a_InitAntenna_Selection(struct rtw_adapter *padapter)

2
drivers/staging/rtl8723au/include/hal_intf.h
View file

@ -158,7 +158,6 @@ struct hal_ops {
void (*hal_notch_filter)(struct rtw_adapter *adapter, bool enable); void (*hal_notch_filter)(struct rtw_adapter *adapter, bool enable);
void (*hal_reset_security_engine)(struct rtw_adapter *adapter); void (*hal_reset_security_engine)(struct rtw_adapter *adapter);
s32 (*c2h_handler)(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt);
}; };
enum rt_eeprom_type { enum rt_eeprom_type {
@ -280,7 +279,6 @@ bool rtw_hal_sreset_inprogress(struct rtw_adapter *padapter);
void rtw_hal_notch_filter23a(struct rtw_adapter *adapter, bool enable); void rtw_hal_notch_filter23a(struct rtw_adapter *adapter, bool enable);
void rtw_hal_reset_security_engine23a(struct rtw_adapter *adapter); void rtw_hal_reset_security_engine23a(struct rtw_adapter *adapter);
s32 rtw_hal_c2h_handler23a(struct rtw_adapter *adapter, struct c2h_evt_hdr *c2h_evt);
void hw_var_set_correct_tsf(struct rtw_adapter *padapter); void hw_var_set_correct_tsf(struct rtw_adapter *padapter);
void hw_var_set_mlme_disconnect(struct rtw_adapter *padapter); void hw_var_set_mlme_disconnect(struct rtw_adapter *padapter);
void hw_var_set_opmode(struct rtw_adapter *padapter, u8 mode); void hw_var_set_opmode(struct rtw_adapter *padapter, u8 mode);

1
drivers/staging/rtl8723au/include/rtl8723a_hal.h
View file

@ -545,5 +545,6 @@ void rtl8723a_start_thread(struct rtw_adapter *padapter);
void rtl8723a_stop_thread(struct rtw_adapter *padapter); void rtl8723a_stop_thread(struct rtw_adapter *padapter);
s32 c2h_id_filter_ccx_8723a(u8 id); s32 c2h_id_filter_ccx_8723a(u8 id);
s32 c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt);
#endif #endif