From 4de7bd54cd0c1576cebe3f17465bafc471cb3c23 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vbernat@wanadooportails.com>
Date: Mon, 17 Nov 2008 09:32:51 +0100
Subject: [PATCH] Fix checks for header files in configure.ac

---
 configure.ac | 5 +++--
 src/compat.h | 4 ++++
 src/lldpd.c  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index bd3f9563..bb25f777 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,9 @@ AM_CONDITIONAL([USE_SNMP], [test "${with_snmp}" != "no"])
 
 # Checks for header files.
 AC_CHECK_DECLS([TAILQ_FIRST, TAILQ_NEXT, TAILQ_FOREACH, TAILQ_EMPTY],[],[],[[#include <sys/queue.h>]])
-AC_CHECK_DECL([PACKET_ORIGDEV],[],[],[[#include <linux/if_packet.h>]])
-AC_CHECK_DECL([ADVERTISED_2500baseX_Full],[],[],[[#include <linux/ethtool.h>]])
+AC_CHECK_DECLS([PACKET_ORIGDEV],[],[],[[#include <linux/if_packet.h>]])
+AC_CHECK_DECLS([ADVERTISED_2500baseX_Full],[],[],[[#include <linux/ethtool.h>]])
+AC_CHECK_DECLS([ETHERTYPE_VLAN],[],[],[[#include <net/ethernet.h>]])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff --git a/src/compat.h b/src/compat.h
index 8e1528f9..77276a51 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -55,3 +55,7 @@
 #if !HAVE_DECL_PACKET_ORIGDEV
 #define PACKET_ORIGDEV 9
 #endif
+
+#if !HAVE_DECL_ETHERTYPE_VLAN
+#define ETHERTYPE_VLAN 0x8100
+#endif
diff --git a/src/lldpd.c b/src/lldpd.c
index 48fb4836..5a649aee 100644
--- a/src/lldpd.c
+++ b/src/lldpd.c
@@ -32,11 +32,11 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
-#include <netpacket/packet.h>
 #include <ifaddrs.h>
 #include <net/if_arp.h>
 #include <linux/filter.h>
 #include <linux/if_vlan.h>
+#include <linux/if_packet.h>
 #include <linux/sockios.h>
 #include <linux/ethtool.h>
 
-- 
2.39.5