Commit 65fb2f98 authored by Marco Cesati's avatar Marco Cesati Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove typedefs in rtw_security.h 



This commit fixes the following checkpatch.pl warning:

    WARNING: do not add new typedefs
    #87: FILE: include/rtw_security.h:87:
    +typedef struct _RT_PMKID_LIST {

Signed-off-by: default avatarMarco Cesati <marco.cesati@gmail.com>
Link: https://lore.kernel.org/r/20210312082638.25512-19-marco.cesati@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c9b5a03

drivers/staging/rtl8723bs/include/rtw_security.h

+3 −3
Original line number Diff line number Diff line
@@ -84,14 +84,14 @@ union Keytype { 
};





typedef struct _RT_PMKID_LIST {

struct RT_PMKID_LIST {

	u8 				bUsed;

	u8 				Bssid[6];

	u8 				PMKID[16];

	u8 				SsidBuf[33];

	u8 *ssid_octet;

	u16 					ssid_length;

} RT_PMKID_LIST, *PRT_PMKID_LIST;

};





struct security_priv {
@@ -166,7 +166,7 @@ struct security_priv { 
	u32 btkip_countermeasure_time;



	/*  For WPA2 Pre-Authentication. */

	RT_PMKID_LIST		PMKIDList[NUM_PMKID_CACHE];	/*  Renamed from PreAuthKey[NUM_PRE_AUTH_KEY]. Annie, 2006-10-13. */

	struct RT_PMKID_LIST		PMKIDList[NUM_PMKID_CACHE];	/*  Renamed from PreAuthKey[NUM_PRE_AUTH_KEY]. Annie, 2006-10-13. */

	u8 		PMKIDIndex;



	u8 bWepDefaultKeyIdxSet;

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -2346,7 +2346,7 @@ static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy, 


	DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));



	memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE);

	memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(struct RT_PMKID_LIST) * NUM_PMKID_CACHE);

	psecuritypriv->PMKIDIndex = 0;



	return 0;

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev, 
	        }

	} else if (pPMK->cmd == IW_PMKSA_FLUSH) {

		DBG_871X("[rtw_wx_set_pmkid] IW_PMKSA_FLUSH!\n");

		memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE);

		memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(struct RT_PMKID_LIST) * NUM_PMKID_CACHE);

		psecuritypriv->PMKIDIndex = 0;

		intReturn = true;

	}

drivers/staging/rtl8723bs/os_dep/mlme_linux.c

+4 −4
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted) 
	indicate_wx_scan_complete_event(padapter);

}



static RT_PMKID_LIST   backupPMKIDList[NUM_PMKID_CACHE];

static struct RT_PMKID_LIST   backupPMKIDList[NUM_PMKID_CACHE];

void rtw_reset_securitypriv(struct adapter *adapter)

{

	u8 backupPMKIDIndex = 0;
@@ -84,7 +84,7 @@ void rtw_reset_securitypriv(struct adapter *adapter) 
		/*  Backup the btkip_countermeasure information. */

		/*  When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */



		memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE);

		memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(struct RT_PMKID_LIST) * NUM_PMKID_CACHE);

		backupPMKIDIndex = adapter->securitypriv.PMKIDIndex;

		backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure;

		backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time;
@@ -96,7 +96,7 @@ void rtw_reset_securitypriv(struct adapter *adapter) 


		/*  Added by Albert 2009/02/18 */

		/*  Restore the PMK information to securitypriv structure for the following connection. */

		memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE);

		memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], sizeof(struct RT_PMKID_LIST) * NUM_PMKID_CACHE);

		adapter->securitypriv.PMKIDIndex = backupPMKIDIndex;

		adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure;

		adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time;
@@ -127,7 +127,7 @@ void rtw_reset_securitypriv(struct adapter *adapter) 


void rtw_os_indicate_disconnect(struct adapter *adapter)

{

	/* RT_PMKID_LIST   backupPMKIDList[ NUM_PMKID_CACHE ]; */

	/* struct RT_PMKID_LIST   backupPMKIDList[ NUM_PMKID_CACHE ]; */



	netif_carrier_off(adapter->pnetdev); /*  Do it first for tx broadcast pkt after disconnection issue! */