aboutsummaryrefslogtreecommitdiffstats
path: root/pcap-usb-linux.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-01-10 14:44:29 +0100
committerPatrick McHardy <kaber@trash.net>2011-01-10 14:44:29 +0100
commit481ab2d4a607c4a4914ddd9debbf336f1f805c61 (patch)
tree790854e4554c575ab59abcc783ebf422b85e730a /pcap-usb-linux.c
parentf6e28f8d1980c94cfe6f18ec22231009c633b69b (diff)
parent028204e0f99f0bad5dfd01add364ebd4f4befabb (diff)
Merge branch 'master' of git://bpf.tcpdump.org/libpcapHEADmaster
Conflicts: pcap/bpf.h Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'pcap-usb-linux.c')
-rw-r--r--pcap-usb-linux.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
index daaa900..f1b430c 100644
--- a/pcap-usb-linux.c
+++ b/pcap-usb-linux.c
@@ -61,8 +61,15 @@ static const char rcsid[] _U_ =
#include <sys/ioctl.h>
#include <sys/mman.h>
#ifdef HAVE_LINUX_USBDEVICE_FS_H
+/*
+ * We might need <linux/compiler.h> to define __user for
+ * <linux/usbdevice_fs.h>.
+ */
+#ifdef HAVE_LINUX_COMPILER_H
+#include <linux/compiler.h>
+#endif /* HAVE_LINUX_COMPILER_H */
#include <linux/usbdevice_fs.h>
-#endif
+#endif /* HAVE_LINUX_USBDEVICE_FS_H */
#define USB_IFACE "usbmon"
#define USB_TEXT_DIR_OLD "/sys/kernel/debug/usbmon"