staging: rtl8723bs: remove memset before memcpy

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Build successfully.

Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Himanshu Jha and committed by

Greg Kroah-Hartman 8 years ago 9c8e28df b55ade19

-5

3 changed files

expand all

drivers

staging

rtl8723bs

core

rtw_ioctl_set.c

rtw_mlme.c

os_dep

mlme_linux.c

-1

drivers/staging/rtl8723bs/core/rtw_ioctl_set.c

··· 127 127 128 128 pibss = padapter->registrypriv.dev_network.MacAddress; 129 129 130 - memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid)); 131 130 memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); 132 131 133 132 rtw_update_registrypriv_dev_network(padapter);

-2

drivers/staging/rtl8723bs/core/rtw_mlme.c

··· 922 922 923 923 RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("switching to adhoc master\n")); 924 924 925 - memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid)); 926 925 memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); 927 926 928 927 rtw_update_registrypriv_dev_network(adapter); ··· 1773 1774 1774 1775 memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_network->network)); 1775 1776 1776 - memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid)); 1777 1777 memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid)); 1778 1778 1779 1779 rtw_update_registrypriv_dev_network(adapter);

-2

drivers/staging/rtl8723bs/os_dep/mlme_linux.c

··· 91 91 /* Backup the btkip_countermeasure information. */ 92 92 /* When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */ 93 93 94 - memset(&backupPMKIDList[ 0 ], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE); 95 - 96 94 memcpy(&backupPMKIDList[ 0 ], &adapter->securitypriv.PMKIDList[ 0 ], sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE); 97 95 backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; 98 96 backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure;