]> git.proxmox.com Git - pve-kernel.git/commitdiff
ixgbe: add 4.13 compat patch
authorFabian Grünbichler <f.gruenbichler@proxmox.com>
Thu, 14 Sep 2017 12:33:09 +0000 (14:33 +0200)
committerFabian Grünbichler <f.gruenbichler@proxmox.com>
Tue, 26 Sep 2017 08:46:35 +0000 (10:46 +0200)
Makefile
patches/intel/ixgbe/ixgbe_4.13_compat.patch [new file with mode: 0644]

index f970a16da858001700992c66608136965aaed910..ee6b4f829cc91411641c84a190f85b064904fdb4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -262,6 +262,7 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        rm -rf ${IXGBEDIR}
        tar xf ${IXGBESRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
+       cd ${IXGBEDIR}; patch -p1 < ../patches/intel/ixgbe/ixgbe_4.13_compat.patch
        cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
diff --git a/patches/intel/ixgbe/ixgbe_4.13_compat.patch b/patches/intel/ixgbe/ixgbe_4.13_compat.patch
new file mode 100644 (file)
index 0000000..5ec2ba4
--- /dev/null
@@ -0,0 +1,14 @@
+diff --git a/src/ixgbe_main.c.orig b/src/ixgbe_main.c
+index 68bead6..bb3a100 100644
+--- a/src/ixgbe_main.c.orig
++++ b/src/ixgbe_main.c
+@@ -9809,7 +9809,8 @@ static void ixgbe_set_prio_tc_map(struct ixgbe_adapter __maybe_unused *adapter)
+ #ifdef NETIF_F_HW_TC
+ static int
+ __ixgbe_setup_tc(struct net_device *dev, __always_unused u32 handle,
+-               __always_unused __be16 proto, struct tc_to_netdev *tc)
++               __always_unused u32 chain_index, __always_unused __be16 proto,
++               struct tc_to_netdev *tc)
+ {
+       if (tc->type != TC_SETUP_MQPRIO)
+               return -EINVAL;