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

staging: rtl8723au: Kill off HW_VAR_CAM_EMPTY_ENTRY and some function layers wrapping it 



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

drivers/staging/rtl8723au/core/rtw_wlan_util.c

+0 −5
Original line number Diff line number Diff line
@@ -478,11 +478,6 @@ unsigned int decide_wait_for_beacon_timeout23a(unsigned int bcn_interval) 
		return bcn_interval << 2;

}



void CAM_empty_entry23a(struct rtw_adapter *Adapter, u8 ucIndex)

{

	rtw_hal_set_hwreg23a(Adapter, HW_VAR_CAM_EMPTY_ENTRY, (u8 *)(&ucIndex));

}



void invalidate_cam_all23a(struct rtw_adapter *padapter)

{

	rtl8723a_cam_invalid_all(padapter);

drivers/staging/rtl8723au/hal/hal_com.c

+4 −2
Original line number Diff line number Diff line
@@ -670,11 +670,13 @@ void rtl8723a_cam_empty_entry(struct rtw_adapter *padapter, u8 ucIndex) 
		/* delay_ms(40); */

		rtw_write32(padapter, WCAMI, ulContent);

		/* RT_TRACE(COMP_SEC, DBG_LOUD,

		   ("CAM_empty_entry23a(): WRITE A4: %lx \n", ulContent));*/

		   ("rtl8723a_cam_empty_entry(): WRITE A4: %lx \n",

		   ulContent));*/

		/* delay_ms(40); */

		rtw_write32(padapter, RWCAM, ulCommand);

		/* RT_TRACE(COMP_SEC, DBG_LOUD,

		   ("CAM_empty_entry23a(): WRITE A0: %lx \n", ulCommand));*/

		   ("rtl8723a_cam_empty_entry(): WRITE A0: %lx \n",

		   ulCommand));*/

	}

}

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

+4 −2
Original line number Diff line number Diff line
@@ -11232,8 +11232,10 @@ void HALBT_RemoveKey(struct rtw_adapter *padapter, u8 EntryNum) 


	if (pBTinfo->BtAsocEntry[EntryNum].HwCAMIndex != 0) {

		/*  ToDo : add New HALBT_RemoveKey function !! */

		if (pBtAssocEntry->HwCAMIndex >= BT_HWCAM_STAR && pBtAssocEntry->HwCAMIndex < HALF_CAM_ENTRY)

			CAM_empty_entry23a(padapter, pBtAssocEntry->HwCAMIndex);

		if (pBtAssocEntry->HwCAMIndex >= BT_HWCAM_STAR &&

		    pBtAssocEntry->HwCAMIndex < HALF_CAM_ENTRY)

			rtl8723a_cam_empty_entry(padapter,

						 pBtAssocEntry->HwCAMIndex);

		pBTinfo->BtAsocEntry[EntryNum].HwCAMIndex = 0;

	}

}

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

+0 −4
Original line number Diff line number Diff line
@@ -3157,10 +3157,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val) 
		rtl8723a_odm_support_ability_clr(padapter, *val32);

		break;



	case HW_VAR_CAM_EMPTY_ENTRY:

		rtl8723a_cam_empty_entry(padapter, *val);

		break;



	case HW_VAR_CAM_WRITE:

		rtl8723a_cam_write(padapter, val32[0], val32[1]);

		break;

drivers/staging/rtl8723au/include/hal_intf.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ enum HW_VARIABLES { 
	HW_VAR_DM_FUNC_OP,

	HW_VAR_DM_FUNC_SET,

	HW_VAR_DM_FUNC_CLR,

	HW_VAR_CAM_EMPTY_ENTRY,

	HW_VAR_CAM_WRITE,

	HW_VAR_CAM_READ,

	HW_VAR_AC_PARAM_VO,