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

staging: rtl8712: avoid a useless call to memset().

In r8711_wx_get_wap(), make sure we do not call memcpy() on a memory area that
has just been zeroed by a call to memset().

Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Cyril Roelandt and committed by
Greg Kroah-Hartman
2df29e7b ac6a98d4

+4 -4
+4 -4
drivers/staging/rtl8712/rtl871x_ioctl_linux.c
··· 1131 1131 struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; 1132 1132 1133 1133 wrqu->ap_addr.sa_family = ARPHRD_ETHER; 1134 - memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); 1135 - if (check_fwstate(pmlmepriv, _FW_LINKED | 1136 - WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE)) { 1134 + if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE | 1135 + WIFI_AP_STATE)) 1137 1136 memcpy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress, ETH_ALEN); 1138 - } 1137 + else 1138 + memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); 1139 1139 return 0; 1140 1140 } 1141 1141