From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 4 Jul 2018 13:42:12 +0000 (+0200)
Subject: use intree NIC driver for 10G IXGBE drivers
X-Git-Url: https://git.proxmox.com/?p=pve-kernel.git;a=commitdiff_plain;h=b5e86998eae2730d725573f2a90cedf11e6f2d1e

use intree NIC driver for 10G IXGBE drivers

no problems had been reported with it, in contrary to igb and e1000e
so use the newer and better supported in tree driver.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/Makefile b/Makefile
index 11f7cfa..43a5257 100644
--- a/Makefile
+++ b/Makefile
@@ -47,9 +47,6 @@ E1000ESRC=${E1000EDIR}.tar.gz
 IGBDIR=igb-5.3.5.18
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-5.3.7
-IXGBESRC=${IXGBEDIR}.tar.gz
-
 ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
 SPLDIR=pkg-spl
 SPLSRC=${ZFSONLINUX_SUBMODULE}/spl-debian
@@ -57,10 +54,10 @@ ZFSDIR=pkg-zfs
 ZFSSRC=${ZFSONLINUX_SUBMODULE}/zfs-debian
 
 MODULES=modules
-MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${IXGBEDIR} ${SPLDIR} ${ZFSDIR}
+MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${SPLDIR} ${ZFSDIR}
 
 # exported to debian/rules via debian/rules.d/dirs.mk
-DIRS=KERNEL_SRC E1000EDIR IGBDIR IXGBEDIR SPLDIR ZFSDIR MODULES
+DIRS=KERNEL_SRC E1000EDIR IGBDIR SPLDIR ZFSDIR MODULES
 
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
@@ -134,12 +131,6 @@ ${IGBDIR}.prepared: ${IGBSRC}
 	cd ${BUILD_DIR}/${MODULES}/${IGBDIR}; patch -p1 < ../../../patches/intel/igb/igb_4.15_mtu.patch
 	touch $@
 
-${IXGBEDIR}.prepared: ${IXGBESRC}
-	rm -rf ${BUILD_DIR}/${MODULES}/${IXGBEDIR} $@
-	mkdir -p ${BUILD_DIR}/${MODULES}/${IXGBEDIR}
-	tar --strip-components=1 -C ${BUILD_DIR}/${MODULES}/${IXGBEDIR} -xf ${IXGBESRC}
-	touch $@
-
 $(SPLDIR).prepared: ${SPLSRC}
 	rm -rf ${BUILD_DIR}/${MODULES}/${SPLDIR} $@
 	mkdir -p ${BUILD_DIR}/${MODULES}/${SPLDIR}
diff --git a/debian/rules b/debian/rules
index 6970fed..e99db8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,8 +105,6 @@ binary: install
 	${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install
 	## install latest ibg driver
 	install -m 644 ${MODULES}/igb.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
-	# install latest ixgbe driver
-	install -m 644 ${MODULES}/ixgbe.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
 	# install latest e1000e driver
 	install -m 644 ${MODULES}/e1000e.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/
 	# install zfs drivers
@@ -194,7 +192,7 @@ binary: install
 	ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build
 	touch $@
 
-.modules_compile_mark: $(addprefix ${MODULES}/,igb.ko ixgbe.ko e1000e.ko spl.ko zfs.ko)
+.modules_compile_mark: $(addprefix ${MODULES}/,igb.ko e1000e.ko spl.ko zfs.ko)
 	touch $@
 
 ${MODULES}/spl.ko: .compile_mark
@@ -220,10 +218,6 @@ ${MODULES}/igb.ko: .compile_mark
 	${MAKE} -C ${MODULES}/${IGBDIR}/src BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
 	cp ${MODULES}/${IGBDIR}/src/igb.ko ${MODULES}/
 
-${MODULES}/ixgbe.ko: .compile_mark
-	${MAKE} -C ${MODULES}/${IXGBEDIR}/src CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
-	cp ${MODULES}/${IXGBEDIR}/src/ixgbe.ko ${MODULES}/
-
 ${MODULES}/e1000e.ko: .compile_mark
 	${MAKE} -C ${MODULES}/${E1000EDIR}/src BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
 	cp ${MODULES}/${E1000EDIR}/src/e1000e.ko ${MODULES}/
diff --git a/ixgbe-5.3.7.tar.gz b/ixgbe-5.3.7.tar.gz
deleted file mode 100644
index 3077fb7..0000000
Binary files a/ixgbe-5.3.7.tar.gz and /dev/null differ