Skip to contentSkip to conversation

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

PATCH In review Cyril Roelandt 2 participants 2 messages Dec 11, 2012 1 message not in the archive

Subsystems (2)
Staging Kernel janitors
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 0121210085516.GO6568@mwanda

Cyril Roelandt

author
#1 lore raw

PATCH v2 1/1 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 <[email protected]>
---
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8712/rtl871x_ioctl_linux.c +4 -4
index 3a64790..72c51b3 100644
@@ -1131,11 +1131,11 @@ static int r8711_wx_get_wap(struct net_device *dev,
 	struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
 
 	wrqu->ap_addr.sa_family = ARPHRD_ETHER;
-	memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
-	if (check_fwstate(pmlmepriv, _FW_LINKED |
-	    WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE)) {
+	if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE |
+				     WIFI_AP_STATE))
 		memcpy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress, ETH_ALEN);
-	}
+	else
+		memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
 	return 0;
 }
Signature · 1 line
1.7.10.4