Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2df29e7b authored by Cyril Roelandt's avatar Cyril Roelandt Committed by Greg Kroah-Hartman
Browse files

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: default avatarCyril Roelandt <tipecaml@gmail.com>
Acked-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac6a98d4

drivers/staging/rtl8712/rtl871x_ioctl_linux.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

}