diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-02-01 08:42:25 +0000 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-02-01 10:03:38 +0100 |
| commit | 36065ae874e170f3f60829b0b5348119b7e15e9a (patch) | |
| tree | 03f70022ab071f0c20ac1543aaca9e656528df65 | |
| parent | 738ce141fb1c5cf77832bb93e21029b882910921 (diff) | |
| download | vyos-build-36065ae874e170f3f60829b0b5348119b7e15e9a.tar.gz vyos-build-36065ae874e170f3f60829b0b5348119b7e15e9a.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
| -rw-r--r-- | data/architectures/amd64.toml | 1 | ||||
| -rwxr-xr-x | packages/linux-kernel/build-intel-ixgbe.sh | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 640a7f49..aa201f1d 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -10,6 +10,7 @@ packages = [ "grub-pc", "vyos-linux-firmware", "vyos-intel-qat", + "vyos-intel-ixgbe", "openvpn-dco", "telegraf" ] 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 |