Fix auxiliary compilation for i40e

ntop · Jan 10, 2024 · de5f903 · de5f903
1 parent 44bd353
commit de5f903
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 53 deletions.
diff --git a/drivers/intel/Makefile.dkms.i40e.in b/drivers/intel/Makefile.dkms.i40e.in
@@ -3,6 +3,7 @@ all: install
 add: veryclean
 	\/bin/rm -rf /usr/src/@I40E@-zc-@I40E_VERSION@.@REVISION@
 	mkdir -p /usr/src/@I40E@-zc-@I40E_VERSION@.@REVISION@/
+	cp @I40E@/@I40E@-@I40E_VERSION@-zc/scripts/check_aux_bus /usr/src/@I40E@-zc-@I40E_VERSION@.@REVISION@/
 	cd @I40E@/@I40E@-@I40E_VERSION@-zc/src/ ; make clean; cp -r * /usr/src/@I40E@-zc-@I40E_VERSION@.@REVISION@/
 	cp ../../kernel/linux/pf_ring.h /usr/src/@I40E@-zc-@I40E_VERSION@.@REVISION@/
 	sed -i -e 's/i40e\.o/i40e_zc.o/' -e 's/i40e-/i40e_zc-/' /usr/src/@I40E@-zc-@I40E_VERSION@.@REVISION@/Kbuild

diff --git a/drivers/intel/i40e/i40e-2.24.6-zc/src/Kbuild b/drivers/intel/i40e/i40e-2.24.6-zc/src/Kbuild
@@ -28,6 +28,9 @@
 # Makefile for the Intel(R) Ethernet Connection XL710 (i40e.ko) driver
 #
 
+BUILD_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+include $(BUILD_DIR)common.mk
+
 obj-m += i40e.o
 
 i40e-objs := i40e_main.o \
@@ -55,6 +58,12 @@ CFLAGS_i40e_main.o := -I$(src)
 
 #i40e-$(CONFIG_FCOE:m=y) += i40e_fcoe.o
 
+ifeq (${NEED_AUX_BUS},2)
+#obj-m += auxiliary.o
+intel_auxiliary-objs := auxiliary.o
+obj-m += intel_auxiliary.o
+endif
+
 EXTRA_CFLAGS += -DHAVE_PF_RING
 KBUILD_EXTRA_SYMBOLS=${PF_RING_PATH}/Module.symvers
 

diff --git a/drivers/intel/i40e/i40e-2.24.6-zc/src/auxiliary.c b/drivers/intel/i40e/i40e-2.24.6-zc/src/auxiliary.c
@@ -10,7 +10,11 @@
 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <linux/string.h>
+#ifdef HAVE_PF_RING
+#include "auxiliary_bus.h"
+#else
 #include "linux/auxiliary_bus.h"
+#endif
 
 static const struct auxiliary_device_id *auxiliary_match_id(const struct auxiliary_device_id *id,
 							    const struct auxiliary_device *auxdev)

diff --git a/.../i40e-2.24.6-zc/src/linux/auxiliary_bus.h → ...l/i40e/i40e-2.24.6-zc/src/auxiliary_bus.h b/.../i40e-2.24.6-zc/src/linux/auxiliary_bus.h → ...l/i40e/i40e-2.24.6-zc/src/auxiliary_bus.h
diff --git a/drivers/intel/i40e/i40e-2.24.6-zc/src/i40e_client.h b/drivers/intel/i40e/i40e-2.24.6-zc/src/i40e_client.h
@@ -5,7 +5,11 @@
 #define _I40E_CLIENT_H_
 
 #ifdef USE_INTEL_AUX_BUS
+#ifdef HAVE_PF_RING
+#include "auxiliary_bus.h"
+#else
 #include "linux/auxiliary_bus.h"
+#endif
 #else
 #include <linux/auxiliary_bus.h>
 #endif /* USE_INTEL_AUX_BUS */

diff --git a/drivers/intel/i40e/i40e-2.24.6-zc/src/kcompat_generated_defs.h b/drivers/intel/i40e/i40e-2.24.6-zc/src/kcompat_generated_defs.h