leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8723au: Call bandwidth and channel setting handlers directly

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-16 10:04:08 +02:00 committed by Greg Kroah-Hartman
parent 82ccb59724
commit 8a6f555fed
4 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/rtl8723au/core/rtw_wlan_util.c
View File

@ -335,7 +335,7 @@ void SelectChannel23a(struct rtw_adapter *padapter, unsigned char channel)
/* saved channel info */ /* saved channel info */
rtw_set_oper_ch23a(padapter, channel); rtw_set_oper_ch23a(padapter, channel);
rtw_hal_set_chan23a(padapter, channel); PHY_SwChnl8723A(padapter, channel);
mutex_unlock(&adapter_to_dvobj(padapter)->setch_mutex); mutex_unlock(&adapter_to_dvobj(padapter)->setch_mutex);
} }
@ -348,8 +348,8 @@ void SetBWMode23a(struct rtw_adapter *padapter, unsigned short bwmode, unsigned
rtw_set_oper_bw23a(padapter, bwmode); rtw_set_oper_bw23a(padapter, bwmode);
rtw_set_oper_ch23aoffset23a(padapter, channel_offset); rtw_set_oper_ch23aoffset23a(padapter, channel_offset);
rtw_hal_set_bwmode23a(padapter, (enum ht_channel_width)bwmode, PHY_SetBWMode23a8723A(padapter, (enum ht_channel_width)bwmode,
channel_offset); channel_offset);
mutex_unlock(&adapter_to_dvobj(padapter)->setbw_mutex); mutex_unlock(&adapter_to_dvobj(padapter)->setbw_mutex);
} }
@ -386,7 +386,7 @@ void set_channel_bwmode23a(struct rtw_adapter *padapter, unsigned char channel,
rtw_set_oper_bw23a(padapter, bwmode); rtw_set_oper_bw23a(padapter, bwmode);
rtw_set_oper_ch23aoffset23a(padapter, channel_offset); rtw_set_oper_ch23aoffset23a(padapter, channel_offset);
rtw_hal_set_chan23a(padapter, center_ch); /* set center channel */ PHY_SwChnl8723A(padapter, center_ch); /* set center channel */
mutex_unlock(&adapter_to_dvobj(padapter)->setch_mutex); mutex_unlock(&adapter_to_dvobj(padapter)->setch_mutex);

14
drivers/staging/rtl8723au/hal/hal_intf.c
View File

@ -197,20 +197,6 @@ s32 rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter)
return _FAIL; return _FAIL;
} }
void rtw_hal_set_bwmode23a(struct rtw_adapter *padapter,
enum ht_channel_width Bandwidth, u8 offset)
{
if (padapter->HalFunc.set_bwmode_handler)
padapter->HalFunc.set_bwmode_handler(padapter, Bandwidth,
offset);
}
void rtw_hal_set_chan23a(struct rtw_adapter *padapter, u8 channel)
{
if (padapter->HalFunc.set_channel_handler)
padapter->HalFunc.set_channel_handler(padapter, channel);
}
void rtw_hal_bcn_related_reg_setting23a(struct rtw_adapter *padapter) void rtw_hal_bcn_related_reg_setting23a(struct rtw_adapter *padapter)
{ {
if (padapter->HalFunc.SetBeaconRelatedRegistersHandler) if (padapter->HalFunc.SetBeaconRelatedRegistersHandler)

3
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
View File

@ -1706,9 +1706,6 @@ exit:
void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc) void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc)
{ {
pHalFunc->set_bwmode_handler = &PHY_SetBWMode23a8723A;
pHalFunc->set_channel_handler = &PHY_SwChnl8723A;
pHalFunc->SetBeaconRelatedRegistersHandler = pHalFunc->SetBeaconRelatedRegistersHandler =
&rtl8723a_SetBeaconRelatedRegisters; &rtl8723a_SetBeaconRelatedRegisters;

7
drivers/staging/rtl8723au/include/hal_intf.h
View File

@ -76,9 +76,6 @@ struct hal_ops {
void (*enable_interrupt)(struct rtw_adapter *padapter); void (*enable_interrupt)(struct rtw_adapter *padapter);
void (*disable_interrupt)(struct rtw_adapter *padapter); void (*disable_interrupt)(struct rtw_adapter *padapter);
s32 (*interrupt_handler)(struct rtw_adapter *padapter); s32 (*interrupt_handler)(struct rtw_adapter *padapter);
void (*set_bwmode_handler)(struct rtw_adapter *padapter,
enum ht_channel_width Bandwidth, u8 Offset);
void (*set_channel_handler)(struct rtw_adapter *padapter, u8 channel);
u8 (*GetHalDefVarHandler)(struct rtw_adapter *padapter, u8 (*GetHalDefVarHandler)(struct rtw_adapter *padapter,
enum hal_def_variable eVariable, enum hal_def_variable eVariable,
@ -214,10 +211,6 @@ void rtw_hal_bcn_related_reg_setting23a(struct rtw_adapter *padapter);
s32 rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter); s32 rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter);
void rtw_hal_set_bwmode23a(struct rtw_adapter *padapter,
enum ht_channel_width Bandwidth, u8 Offset);
void rtw_hal_set_chan23a(struct rtw_adapter *padapter, u8 channel);
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);