staging: rtl8188eu: rename struct field Bssid -> bssid (43320adc) · Commits · 戴 / test

drivers/staging/rtl8188eu/core/rtw_mlme.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1673,7 +1673,7 @@ static int SecIsInPMKIDList(struct adapter Adapter, u8 bssid)

		do {
		if ((psecuritypriv->PMKIDList[i].bUsed) &&
		(!memcmp(psecuritypriv->PMKIDList[i].Bssid, bssid, ETH_ALEN)))
		(!memcmp(psecuritypriv->PMKIDList[i].bssid, bssid, ETH_ALEN)))
		break;
		} while (++i < NUM_PMKID_CACHE);

drivers/staging/rtl8188eu/include/rtw_security.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ union Keytype {

		struct rt_pmkid_list {
		u8 bUsed;
		u8 Bssid[6];
		u8 bssid[6];
		u8 PMKID[16];
		u8 SsidBuf[33];
		u8 *ssid_octet;

drivers/staging/rtl8188eu/os_dep/ioctl_linux.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -778,7 +778,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev,

		/* overwrite PMKID */
		for (j = 0; j < NUM_PMKID_CACHE; j++) {
		if (!memcmp(psecuritypriv->PMKIDList[j].Bssid, strIssueBssid, ETH_ALEN)) {
		if (!memcmp(psecuritypriv->PMKIDList[j].bssid, strIssueBssid, ETH_ALEN)) {
		/* BSSID is matched, the same AP => rewrite with new PMKID. */
		DBG_88E("[%s] BSSID exists in the PMKList.\n", __func__);
		memcpy(psecuritypriv->PMKIDList[j].PMKID, pPMK->pmkid, IW_PMKID_LEN);
		@@ -794,7 +794,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev,
		DBG_88E("[%s] Use the new entry index = %d for this PMKID.\n",
		__func__, psecuritypriv->PMKIDIndex);

		memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, strIssueBssid, ETH_ALEN);
		memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].bssid, strIssueBssid, ETH_ALEN);
		memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, pPMK->pmkid, IW_PMKID_LEN);

		psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].bUsed = true;
		@@ -806,9 +806,9 @@ static int rtw_wx_set_pmkid(struct net_device *dev,
		DBG_88E("[%s] IW_PMKSA_REMOVE!\n", __func__);
		ret = true;
		for (j = 0; j < NUM_PMKID_CACHE; j++) {
		if (!memcmp(psecuritypriv->PMKIDList[j].Bssid, strIssueBssid, ETH_ALEN)) {
		if (!memcmp(psecuritypriv->PMKIDList[j].bssid, strIssueBssid, ETH_ALEN)) {
		/* BSSID is matched, the same AP => Remove this PMKID information and reset it. */
		eth_zero_addr(psecuritypriv->PMKIDList[j].Bssid);
		eth_zero_addr(psecuritypriv->PMKIDList[j].bssid);
		psecuritypriv->PMKIDList[j].bUsed = false;
		break;
		}

Admin message