From 8d8431b2b10c0cf8083ceeaf48f75ce753fae915 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Tue, 11 Dec 2012 01:20:48 +0100 Subject: [PATCH] --- yaml --- r: 353960 b: refs/heads/master c: 2df29e7bf2e99bfb085370753291083ae745b057 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4f4b9bb0aa26..ba6fd2ac63d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac6a98d452baa4f9acae7c2238f6626bae8283ff +refs/heads/master: 2df29e7bf2e99bfb085370753291083ae745b057 diff --git a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index 3a6479064519..72c51b31830a 100644 --- a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -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; }