diff options
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | cmakeconfig.h.in | 3 | ||||
-rw-r--r-- | config.h.in | 3 | ||||
-rwxr-xr-x | configure | 17 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | pcap-linux.c | 8 |
6 files changed, 1 insertions, 38 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b0ed3608..4697905d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1324,8 +1324,6 @@ else(WIN32) endif() endif() - check_include_file(linux/ethtool.h HAVE_LINUX_ETHTOOL_H) - check_struct_has_member("struct tpacket_auxdata" tp_vlan_tci linux/if_packet.h HAVE_STRUCT_TPACKET_AUXDATA_TP_VLAN_TCI) elseif(PCAP_TYPE STREQUAL "bpf") # diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 40902b96..0d7cd6f6 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -87,9 +87,6 @@ /* Define to 1 if you have the <linux/compiler.h> header file. */ #cmakedefine HAVE_LINUX_COMPILER_H 1 -/* Define to 1 if you have the <linux/ethtool.h> header file. */ -#cmakedefine HAVE_LINUX_ETHTOOL_H 1 - /* define if we have the Linux getnetbyname_r() */ #cmakedefine HAVE_LINUX_GETNETBYNAME_R 1 diff --git a/config.h.in b/config.h.in index b747a51e..9de00b3b 100644 --- a/config.h.in +++ b/config.h.in @@ -96,9 +96,6 @@ /* Define to 1 if you have the <linux/compiler.h> header file. */ #undef HAVE_LINUX_COMPILER_H -/* Define to 1 if you have the <linux/ethtool.h> header file. */ -#undef HAVE_LINUX_ETHTOOL_H - /* define if we have the Linux getnetbyname_r() */ #undef HAVE_LINUX_GETNETBYNAME_R @@ -7078,23 +7078,6 @@ fi fi fi - for ac_header in linux/ethtool.h -do : - ac_fn_c_check_header_compile "$LINENO" "linux/ethtool.h" "ac_cv_header_linux_ethtool_h" " -$ac_includes_default -#include <linux/types.h> - -" -if test "x$ac_cv_header_linux_ethtool_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LINUX_ETHTOOL_H 1 -_ACEOF - -fi - -done - - # # Check to see if the tpacket_auxdata struct has a tp_vlan_tci member. # diff --git a/configure.ac b/configure.ac index 017887d1..c5365380 100644 --- a/configure.ac +++ b/configure.ac @@ -940,12 +940,6 @@ linux) fi fi - AC_CHECK_HEADERS(linux/ethtool.h,,, - [ -AC_INCLUDES_DEFAULT -#include <linux/types.h> - ]) - # # Check to see if the tpacket_auxdata struct has a tp_vlan_tci member. # diff --git a/pcap-linux.c b/pcap-linux.c index 2ae12226..cf007297 100644 --- a/pcap-linux.c +++ b/pcap-linux.c @@ -89,6 +89,7 @@ #include <linux/if.h> #include <linux/if_packet.h> #include <linux/sockios.h> +#include <linux/ethtool.h> #include <netinet/in.h> #include <linux/if_ether.h> #include <linux/if_arp.h> @@ -158,13 +159,6 @@ #include <netlink/attr.h> #endif /* HAVE_LIBNL */ -/* - * Got ethtool support? - */ -#ifdef HAVE_LINUX_ETHTOOL_H -#include <linux/ethtool.h> -#endif - #ifndef HAVE_SOCKLEN_T typedef int socklen_t; #endif |