summaryrefslogtreecommitdiff
path: root/netwerk
diff options
context:
space:
mode:
authorJan Beich <jbeich@vfemail.net>2014-11-24 00:10:00 -0500
committerJan Beich <jbeich@FreeBSD.org>2016-07-26 12:03:00 +0000
commite9ee4f5cdb4f1b8453da17ec47b6455c61c8a481 (patch)
tree6c7eb09cc88e7908b2531ef3ce1e24efc3b614ab /netwerk
parentfafeae02a6ed80973402f6f428c31536e7003fc2 (diff)
downloadpalemoon-gre-e9ee4f5cdb4f1b8453da17ec47b6455c61c8a481.tar.gz
Bug 1103858 - Enable FreeBSD wifi scanner on DragonFly. r=ted, r=jdm
Diffstat (limited to 'netwerk')
-rw-r--r--netwerk/wifi/moz.build2
-rw-r--r--netwerk/wifi/nsWifiScannerFreeBSD.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build
index ad570dc7f..2dcdfa03b 100644
--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@@ -31,7 +31,7 @@ if CONFIG['OS_ARCH'] == 'Darwin':
CPP_SOURCES += [
'nsWifiScannerMac.cpp',
]
-elif CONFIG['OS_ARCH'] == 'FreeBSD':
+elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'):
CPP_SOURCES += [
'nsWifiScannerFreeBSD.cpp',
]
diff --git a/netwerk/wifi/nsWifiScannerFreeBSD.cpp b/netwerk/wifi/nsWifiScannerFreeBSD.cpp
index 74bc82eaf..e117ba096 100644
--- a/netwerk/wifi/nsWifiScannerFreeBSD.cpp
+++ b/netwerk/wifi/nsWifiScannerFreeBSD.cpp
@@ -13,7 +13,11 @@
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_media.h>
+#ifdef __DragonFly__
+#include <netproto/802_11/ieee80211_ioctl.h>
+#else
#include <net80211/ieee80211_ioctl.h>
+#endif
#include <ifaddrs.h>
#include <string.h>