summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@ovn.org>2018-10-03 15:39:32 -0700
committerBen Pfaff <blp@ovn.org>2018-10-03 16:55:55 -0700
commit64ed99ffbc4298f8a298b20f503e188b35398546 (patch)
treeee1acf70e5c0c0879beae63140ff1f871cbb31f4
parent000b4a3df0b0ce1ffa2cd7f832de8042fa7c0578 (diff)
downloadopenvswitch-64ed99ffbc4298f8a298b20f503e188b35398546.tar.gz
netdev-linux: Don't include <net/if_packet.h>.
This header only defines sockaddr_pkt, which this source file doesn't use. This was the only user of net/if_packet.h, so also remove the configure-time test for it (which netdev-linux wasn't using anyway). Reported-by: Andre McCurdy <armccurdy@gmail.com> Reported-at: https://github.com/openvswitch/ovs/pull/253 Signed-off-by: Ben Pfaff <blp@ovn.org>
-rw-r--r--acinclude.m411
-rw-r--r--configure.ac1
-rw-r--r--lib/netdev-linux.c1
3 files changed, 0 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 8d8503498..ed83df43d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -906,17 +906,6 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
fi
])
-dnl Checks for net/if_packet.h.
-AC_DEFUN([OVS_CHECK_IF_PACKET],
- [AC_CHECK_HEADER([net/if_packet.h],
- [HAVE_IF_PACKET=yes],
- [HAVE_IF_PACKET=no])
- AM_CONDITIONAL([HAVE_IF_PACKET], [test "$HAVE_IF_PACKET" = yes])
- if test "$HAVE_IF_PACKET" = yes; then
- AC_DEFINE([HAVE_IF_PACKET], [1],
- [Define to 1 if net/if_packet.h is available.])
- fi])
-
dnl Checks for net/if_dl.h.
dnl
dnl (We use this as a proxy for checking whether we're building on FreeBSD
diff --git a/configure.ac b/configure.ac
index aa92b151a..2b3800310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,6 @@ OVS_CHECK_PYTHON
OVS_CHECK_FLAKE8
OVS_CHECK_SPHINX
OVS_CHECK_DOT
-OVS_CHECK_IF_PACKET
OVS_CHECK_IF_DL
OVS_CHECK_STRTOK_R
AC_CHECK_DECLS([sys_siglist], [], [], [[#include <signal.h>]])
diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index 3c6eb48ea..f86dcd06e 100644
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
@@ -39,7 +39,6 @@
#include <netpacket/packet.h>
#include <net/if.h>
#include <net/if_arp.h>
-#include <net/if_packet.h>
#include <net/route.h>
#include <poll.h>
#include <stdlib.h>