From: Roy Marples <roy@marples.name>
Date: Tue, 2 Sep 2008 15:25:14 +0000 (+0000)
Subject: Fix compile and wireless test on FreeBSD.
X-Git-Tag: v5.0.0~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccf0a5f559a4cbe55e44b43861f02e73801b33cc;p=thirdparty%2Fdhcpcd.git

Fix compile and wireless test on FreeBSD.
---

diff --git a/dhcpcd.h b/dhcpcd.h
index 061a1d1b..86aa4959 100644
--- a/dhcpcd.h
+++ b/dhcpcd.h
@@ -28,6 +28,7 @@
 #ifndef DHCPCD_H
 #define DHCPCD_H
 
+#include <sys/socket.h>
 #include <net/if.h>
 
 #include <limits.h>
diff --git a/if-options.h b/if-options.h
index 154aef2a..11753f46 100644
--- a/if-options.h
+++ b/if-options.h
@@ -28,6 +28,7 @@
 #ifndef IF_OPTIONS_H
 #define IF_OPTIONS_H
 
+#include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
 
diff --git a/net.c b/net.c
index fecfe8c7..9f58c97b 100644
--- a/net.c
+++ b/net.c
@@ -267,7 +267,7 @@ init_interface(const char *ifname)
 	strlcpy(ireq.i_name, ifname, sizeof(ireq.i_name));
 	ireq.i_type = IEEE80211_IOC_NUMSSIDS;
 	ireq.i_val = 3;
-	if ((x = ioctl(s, SIOCG80211, &ireq)) != -1)
+	if (ioctl(s, SIOCG80211, &ireq) != -1)
 		iface->metric += 100; 
 #endif