Fixup

tbarbette · Sep 25, 2024 · fef7ef2 · fef7ef2
1 parent be088b2
commit fef7ef2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/config-userlevel.h.in b/config-userlevel.h.in
@@ -116,12 +116,21 @@
 /* Define if your C library contains large file support. */
 #undef HAVE_LARGE_FILE_SUPPORT
 
+/* Define if you have the <linux/ethtool.h> header file. */
+#undef HAVE_LINUX_ETHTOOL_H
+
+/* Define if you have the <linux/sockios.h> header file. */
+#undef HAVE_LINUX_SOCKIOS_H
+
 /* Define if you have the <linux/if_tun.h> header file. */
 #undef HAVE_LINUX_IF_TUN_H
 
 /* Define if you have the <linux/if_packet.h> header file. */
 #undef HAVE_LINUX_IF_PACKET_H
 
+/* Define if you have the <linux/netlink.h> header file. */
+#undef HAVE_LINUX_NETLINK_H
+
 /* Define if you have the madvise function. */
 #undef HAVE_MADVISE
 

diff --git a/configure.in b/configure.in
@@ -348,7 +348,7 @@ AC_ARG_ENABLE([flow-api], [AS_HELP_STRING([    --enable-flow-api], [Support for
 
 AC_ARG_ENABLE([click-pool],
     [AS_HELP_STRING([    --disable-click-pool], [allow usage of Click Packet pool. It will still only be effectively enabled in specific (but most) cases, see packet.hh])],
-    [:], [enable_click_pool=yes;AC_DEFINE(ALLOW_CLICK_PACKET_POOL)])
+    [:], [enable_click_pool=yes;AC_DEFINE(HAVE_ALLOW_CLICK_PACKET_POOL,[1],[Define if Click packet pool can be used if others flags allow it (see packet.hh).])])
 
 
 AC_ARG_ENABLE([pool-inlining],

diff --git a/elements/userlevel/fromdevice.cc b/elements/userlevel/fromdevice.cc
@@ -44,7 +44,9 @@
 #include <click/standard/scheduleinfo.hh>
 #include <click/userutils.hh>
 #include <netinet/if_ether.h>
-#define _LINUX_IF_ETHER_H 1
+#ifndef define
+# define _LINUX_IF_ETHER_H 1
+#endif
 #ifdef HAVE_LINUX_ETHTOOL_H
 #include <linux/ethtool.h>
 #endif

diff --git a/include/click/packet.hh b/include/click/packet.hh
@@ -23,7 +23,10 @@
 #if CLICK_NS
 # include <click/simclick.h>
 #endif
-#if !CLICK_PACKET_USE_DPDK && (CLICK_USERLEVEL || CLICK_NS || CLICK_MINIOS) && (!HAVE_MULTITHREAD || HAVE___THREAD_STORAGE_CLASS) && !(NETMAP_PACKET_POOL) && HAVE_ALLOW_CLICK_PACKET_POOL
+#if !CLICK_PACKET_USE_DPDK && \
+    (CLICK_USERLEVEL || CLICK_NS || CLICK_MINIOS) && \
+    (!HAVE_MULTITHREAD || HAVE___THREAD_STORAGE_CLASS) && \
+    HAVE_ALLOW_CLICK_PACKET_POOL
 # define HAVE_CLICK_PACKET_POOL 1
 #endif
 #ifndef CLICK_PACKET_DEPRECATED_ENUM