Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: rtl8723au: Use proper name REG_CAMCMD and remove wrapper invalidate_cam_all23a() 



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

drivers/staging/rtl8723au/core/rtw_wlan_util.c

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

}



void invalidate_cam_all23a(struct rtw_adapter *padapter)

{

	rtl8723a_cam_invalid_all(padapter);

}



void clear_cam_entry23a(struct rtw_adapter *padapter, u8 entry)

{

	unsigned char null_sta[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -483,7 +478,7 @@ void flush_all_cam_entry23a(struct rtw_adapter *padapter) 
	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;



	rtl8723a_cam_invalid_all(padapter);

	rtl8723a_cam_invalidate_all(padapter);



	memset(pmlmeinfo->FW_sta_info, 0, sizeof(pmlmeinfo->FW_sta_info));

}

drivers/staging/rtl8723au/hal/hal_com.c

+4 −4
Original line number Diff line number Diff line
@@ -669,16 +669,16 @@ void rtl8723a_cam_empty_entry(struct rtw_adapter *padapter, u8 ucIndex) 
		   ("rtl8723a_cam_empty_entry(): WRITE A4: %lx \n",

		   ulContent));*/

		/* delay_ms(40); */

		rtl8723au_write32(padapter, RWCAM, ulCommand);

		rtl8723au_write32(padapter, REG_CAMCMD, ulCommand);

		/* RT_TRACE(COMP_SEC, DBG_LOUD,

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

		   ulCommand));*/

	}

}



void rtl8723a_cam_invalid_all(struct rtw_adapter *padapter)

void rtl8723a_cam_invalidate_all(struct rtw_adapter *padapter)

{

	rtl8723au_write32(padapter, RWCAM, BIT(31) | BIT(30));

	rtl8723au_write32(padapter, REG_CAMCMD, CAM_POLLINIG | BIT(30));

}



void rtl8723a_cam_write(struct rtw_adapter *padapter,
@@ -708,7 +708,7 @@ void rtl8723a_cam_write(struct rtw_adapter *padapter, 


		rtl8723au_write32(padapter, WCAMI, val);

		cmd = CAM_POLLINIG | CAM_WRITE | (addr + j);

		rtl8723au_write32(padapter, RWCAM, cmd);

		rtl8723au_write32(padapter, REG_CAMCMD, cmd);



		/* DBG_8723A("%s => cam write: %x, %x\n", __func__, cmd, val);*/

	}

drivers/staging/rtl8723au/hal/usb_halinit.c

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ static int rtl8723au_hal_init(struct rtw_adapter *Adapter) 
	_BBTurnOnBlock(Adapter);

	/* NicIFSetMacAddress(padapter, padapter->PermanentAddress); */



	invalidate_cam_all23a(Adapter);

	rtl8723a_cam_invalidate_all(Adapter);



	/*  2010/12/17 MH We need to set TX power according to EFUSE content at first. */

	PHY_SetTxPowerLevel8723A(Adapter, pHalData->CurrentChannel);

drivers/staging/rtl8723au/include/hal_com.h

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ void rtl8723a_set_slot_time(struct rtw_adapter *padapter, u8 slottime); 
void rtl8723a_ack_preamble(struct rtw_adapter *padapter, u8 bShortPreamble);

void rtl8723a_set_sec_cfg(struct rtw_adapter *padapter, u8 sec);

void rtl8723a_cam_empty_entry(struct rtw_adapter *padapter, u8 ucIndex);

void rtl8723a_cam_invalid_all(struct rtw_adapter *padapter);

void rtl8723a_cam_invalidate_all(struct rtw_adapter *padapter);

void rtl8723a_cam_write(struct rtw_adapter *padapter,

			u8 entry, u16 ctrl, const u8 *mac, const u8 *key);

void rtl8723a_fifo_cleanup(struct rtw_adapter *padapter);

drivers/staging/rtl8723au/include/rtl8723a_spec.h

+0 −2
Original line number Diff line number Diff line
@@ -454,8 +454,6 @@ 
/*  */

/*  9. Security Control Registers	(Offset: ) */

/*  */

	/* IN 8190 Data Sheet is called CAMcmd */

#define	RWCAM				REG_CAMCMD

	/*  Software write CAM input content */

#define	WCAMI				REG_CAMWRITE

	/*  Software read/write CAM config */