Skip to content

Commit

Permalink
netdev-linux: Don't include <net/if_packet.h>.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reported-at: openvswitch/ovs#253
Signed-off-by: Ben Pfaff <[email protected]>
  • Loading branch information
blp committed Oct 3, 2018
1 parent 000b4a3 commit 64ed99f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 13 deletions.
11 changes: 0 additions & 11 deletions acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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>]])
Expand Down
1 change: 0 additions & 1 deletion lib/netdev-linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 64ed99f

Please sign in to comment.