Commit 9c8e28df authored by Himanshu Jha's avatar Himanshu Jha Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove memset before memcpy 



calling memcpy immediately after memset with the same region of memory
makes memset redundant.

Build successfully.

Signed-off-by: default avatarHimanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b55ade19

drivers/staging/rtl8723bs/core/rtw_ioctl_set.c

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ u8 rtw_do_join(struct adapter *padapter) 


				pibss = padapter->registrypriv.dev_network.MacAddress;



				memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));

				memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));



				rtw_update_registrypriv_dev_network(padapter);

drivers/staging/rtl8723bs/core/rtw_mlme.c

+0 −2
Original line number Diff line number Diff line
@@ -922,7 +922,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) 


					RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("switching to adhoc master\n"));



					memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));

					memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));



					rtw_update_registrypriv_dev_network(adapter);
@@ -1774,7 +1773,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) 


			memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_network->network));



			memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));

			memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));



			rtw_update_registrypriv_dev_network(adapter);

drivers/staging/rtl8723bs/os_dep/mlme_linux.c

+0 −2
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ 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. */



		memset(&backupPMKIDList[ 0 ], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE);



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

		backupPMKIDIndex = adapter->securitypriv.PMKIDIndex;

		backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure;

CRA Git | Maintained and supported by SUSTech CRA and CCSE