summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-02-01 08:42:25 +0000
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-02-01 09:14:09 +0000
commite3be537a9fd4686173b1064326d7fa7d51b67662 (patch)
tree91907bf6c9a33bca2176dabafc0011cbe49450a9 /packages
parent8bd0c92abf4b1991e11b33fe21bb24148cc21a60 (diff)
downloadvyos-build-e3be537a9fd4686173b1064326d7fa7d51b67662.tar.gz
vyos-build-e3be537a9fd4686173b1064326d7fa7d51b67662.zip
ixgbe: T5619: remove pci_*_pcie_error_reporting() code to work with Kernel 6.6
This fixes commit 0f80a22b5 ("T5619: Add out-of-tree Intel ixgbe driver") to work with the latest 6.6 code base. For more information see https://lore.kernel.org/lkml/f90837d0-810e-5772-7841-28d47c44d260@intel.com (cherry picked from commit 36065ae874e170f3f60829b0b5348119b7e15e9a)
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/linux-kernel/build-intel-ixgbe.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/linux-kernel/build-intel-ixgbe.sh b/packages/linux-kernel/build-intel-ixgbe.sh
index 8ca01a9e..4f6d974b 100755
--- a/packages/linux-kernel/build-intel-ixgbe.sh
+++ b/packages/linux-kernel/build-intel-ixgbe.sh
@@ -14,7 +14,7 @@ fi
. ${KERNEL_VAR_FILE}
-url="https://sourceforge.net/projects/e1000/files/ixgbe%20stable/5.19.6/ixgbe-5.19.6.tar.gz"
+url="https://sourceforge.net/projects/e1000/files/ixgbe%20stable/5.19.9/ixgbe-5.19.9.tar.gz"
cd ${CWD}
@@ -52,8 +52,13 @@ if [ -z $KERNEL_DIR ]; then
exit 1
fi
+# See https://lore.kernel.org/lkml/f90837d0-810e-5772-7841-28d47c44d260@intel.com/
+echo "I: remove pci_enable_pcie_error_reporting() code no longer present in Kernel"
+sed -i '/.*pci_disable_pcie_error_reporting(pdev);/d' ixgbe_main.c
+sed -i '/.*pci_enable_pcie_error_reporting(pdev);/d' ixgbe_main.c
+
echo "I: Compile Kernel module for Intel ${DRIVER_NAME} driver"
-make INSTALL_MOD_PATH=${DEBIAN_DIR} INSTALL_FW_PATH=${DEBIAN_DIR} -j $(getconf _NPROCESSORS_ONLN) install
+make KSRC=${KERNEL_DIR} INSTALL_MOD_PATH=${DEBIAN_DIR} INSTALL_FW_PATH=${DEBIAN_DIR} -j $(getconf _NPROCESSORS_ONLN) install
if [ "x$?" != "x0" ]; then
exit 1