Commit ac4cbc68 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Pull update_ramask call out of HAL wrapper layer 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 638443dc

drivers/staging/rtl8723au/hal/hal_intf.c

+2 −4
Original line number Diff line number Diff line
@@ -87,10 +87,8 @@ void rtw_hal_update_ra_mask23a(struct sta_info *psta, u8 rssi_level) 
#ifdef CONFIG_8723AU_AP_MODE

		add_RATid23a(padapter, psta, rssi_level);

#endif

	} else {

		if (padapter->HalFunc.UpdateRAMaskHandler)

			padapter->HalFunc.UpdateRAMaskHandler(padapter, psta->mac_id, rssi_level);

	}

	} else

		rtl8723a_update_ramask(padapter, psta->mac_id, rssi_level);

}



s32	rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter)

drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c

+2 −2
Original line number Diff line number Diff line
@@ -4662,8 +4662,8 @@ bthci_StateConnected(struct rtw_adapter *padapter, 


		/*  for rate adaptive */



		if (padapter->HalFunc.UpdateRAMaskHandler)

			padapter->HalFunc.UpdateRAMaskHandler(padapter, MAX_FW_SUPPORT_MACID_NUM-1-EntryNum, 0);

		rtl8723a_update_ramask(padapter,

				       MAX_FW_SUPPORT_MACID_NUM-1-EntryNum, 0);



		HalSetBrateCfg23a(padapter, padapter->mlmepriv.cur_network.network.SupportedRates);

		BTDM_SetFwChnlInfo(padapter, RT_MEDIA_CONNECT);

drivers/staging/rtl8723au/hal/usb_halinit.c

+2 −3
Original line number Diff line number Diff line
@@ -1612,7 +1612,7 @@ static u8 SetHalDefVar8192CUsb(struct rtw_adapter *Adapter, 
	return bResult;

}



static void UpdateHalRAMask8192CUsb(struct rtw_adapter *padapter,

void rtl8723a_update_ramask(struct rtw_adapter *padapter,

			    u32 mac_id, u8 rssi_level)

{

	u8	init_rate = 0;
@@ -1778,6 +1778,5 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter) 


	pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb;

	pHalFunc->SetHalDefVarHandler = &SetHalDefVar8192CUsb;

	pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8192CUsb;

	return 0;

}

drivers/staging/rtl8723au/include/hal_intf.h

+0 −3
Original line number Diff line number Diff line
@@ -76,9 +76,6 @@ struct hal_ops { 
	u8 (*SetHalDefVarHandler)(struct rtw_adapter *padapter,

				  enum hal_def_variable eVariable,

				  void *pValue);



	void (*UpdateRAMaskHandler)(struct rtw_adapter *padapter,

				    u32 mac_id, u8 rssi_level);

};



enum rt_eeprom_type {

drivers/staging/rtl8723au/include/rtl8723a_hal.h

+2 −0
Original line number Diff line number Diff line
@@ -557,5 +557,7 @@ rtl8723a_readefuse(struct rtw_adapter *padapter, 
		   u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf);

u16 rtl8723a_EfuseGetCurrentSize_WiFi(struct rtw_adapter *padapter);

u16 rtl8723a_EfuseGetCurrentSize_BT(struct rtw_adapter *padapter);

void rtl8723a_update_ramask(struct rtw_adapter *padapter,

			    u32 mac_id, u8 rssi_level);



#endif