From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 29 Jul 2011 14:14:32 +0000 (+0000)
Subject: hostapd: fix a compile issue when compiling wpa_supplicant (fixes #9837)
X-Git-Tag: reboot~16142
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35463493e85a205b632c3b8970f879a9566235fe;p=oweals%2Fopenwrt.git

hostapd: fix a compile issue when compiling wpa_supplicant (fixes #9837)

SVN-Revision: 27830
---

diff --git a/package/hostapd/patches/780-wds_addr_fix.patch b/package/hostapd/patches/780-wds_addr_fix.patch
index bd2f5554eb..4c91d03a52 100644
--- a/package/hostapd/patches/780-wds_addr_fix.patch
+++ b/package/hostapd/patches/780-wds_addr_fix.patch
@@ -55,12 +55,11 @@
  		new_addr[0] ^= idx << 2;
  		if (!nl80211_addr_in_use(drv->global, new_addr))
  			break;
-@@ -5980,6 +5980,8 @@ static int wpa_driver_nl80211_if_add(voi
- 	}
- #endif /* CONFIG_P2P */
- 
-+	memcpy(new_bss->addr, addr ? addr : if_addr, ETH_ALEN);
-+
- #ifdef HOSTAPD
- 	if (bridge &&
- 	    i802_check_bridge(drv, new_bss, bridge, ifname) < 0) {
+@@ -5996,6 +5996,7 @@ static int wpa_driver_nl80211_if_add(voi
+ 			os_free(new_bss);
+ 			return -1;
+ 		}
++		memcpy(new_bss->addr, addr ? addr : if_addr, ETH_ALEN);
+ 		os_strlcpy(new_bss->ifname, ifname, IFNAMSIZ);
+ 		new_bss->ifindex = ifidx;
+ 		new_bss->drv = drv;