Fix auxiliary compilation for iavf

ntop · Jan 10, 2024 · 9a8b4f6 · 9a8b4f6
1 parent de5f903
commit 9a8b4f6
Show file tree

Hide file tree

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

diff --git a/drivers/intel/iavf/iavf-4.9.5-zc/src/Kbuild b/drivers/intel/iavf/iavf-4.9.5-zc/src/Kbuild
@@ -2,6 +2,9 @@
 # Makefile for the Intel Ethernet Adaptive Virtual Function Driver
 #
 
+BUILD_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+include $(BUILD_DIR)common.mk
+
 obj-m += iavf.o
 
 iavf-objs := iavf_main.o \
@@ -18,6 +21,12 @@ iavf-objs := iavf_main.o \
 
 CFLAGS_iavf_main.o := -I$(src)
 
+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/iavf/iavf-4.9.5-zc/src/auxiliary.c b/drivers/intel/iavf/iavf-4.9.5-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/...f/iavf-4.9.5-zc/src/linux/auxiliary_bus.h → ...el/iavf/iavf-4.9.5-zc/src/auxiliary_bus.h b/...f/iavf-4.9.5-zc/src/linux/auxiliary_bus.h → ...el/iavf/iavf-4.9.5-zc/src/auxiliary_bus.h
diff --git a/drivers/intel/iavf/iavf-4.9.5-zc/src/iidc.h b/drivers/intel/iavf/iavf-4.9.5-zc/src/iidc.h
@@ -10,7 +10,11 @@
 #include <linux/kernel.h>
 #include <linux/netdevice.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 */