commit bf6e0baa89b80019dee7ebfbee1fc34581255a19
author Hai Shalom <haishalom@google.com> Mon Feb 11 12:01:50 2019 -0800
committer Peiyong Lin <lpy@google.com> Mon Feb 11 22:30:04 2019 +0000
tree fcd62236b41c2ce5b04923ba7a5a0213c8397ead
parent 39bc25d3a79c1375de430a7918d949c1a86f70c6

Revert "[wpa_supplicant] Cumulative patch from c4e90da6d"

This reverts commit 39bc25d3a79c1375de430a7918d949c1a86f70c6.

Test: Compilation
Change-Id: Iae7670429466958911b5296cb1359bceecc0b03e
Exempt-From-Owner-Approval: Revert since it's breaking the build

src/drivers/linux_ioctl.c

diff --git a/src/drivers/linux_ioctl.c b/src/drivers/linux_ioctl.c
index 7edb9df..e21147a 100644
--- a/src/drivers/linux_ioctl.c
+++ b/src/drivers/linux_ioctl.c
@@ -12,7 +12,6 @@
 #include <net/if_arp.h>
 
 #include "utils/common.h"
-#include "common/linux_bridge.h"
 #include "linux_ioctl.h"
 
 
@@ -120,14 +119,25 @@
 }
 
 
+#ifndef SIOCBRADDBR
+#define SIOCBRADDBR 0x89a0
+#endif
+#ifndef SIOCBRDELBR
+#define SIOCBRDELBR 0x89a1
+#endif
+#ifndef SIOCBRADDIF
+#define SIOCBRADDIF 0x89a2
+#endif
+#ifndef SIOCBRDELIF
+#define SIOCBRDELIF 0x89a3
+#endif
+
+
 int linux_br_add(int sock, const char *brname)
 {
 	if (ioctl(sock, SIOCBRADDBR, brname) < 0) {
-		int saved_errno = errno;
-
 		wpa_printf(MSG_DEBUG, "Could not add bridge %s: %s",
 			   brname, strerror(errno));
-		errno = saved_errno;
 		return -1;
 	}
 
@@ -160,11 +170,8 @@
 	os_strlcpy(ifr.ifr_name, brname, IFNAMSIZ);
 	ifr.ifr_ifindex = ifindex;
 	if (ioctl(sock, SIOCBRADDIF, &ifr) < 0) {
-		int saved_errno = errno;
-
 		wpa_printf(MSG_DEBUG, "Could not add interface %s into bridge "
 			   "%s: %s", ifname, brname, strerror(errno));
-		errno = saved_errno;
 		return -1;
 	}