From: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Date: Thu, 14 Sep 2017 12:17:11 +0000 (+0200)
Subject: igb: add 4.12 compat patch
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=628004c405a1e6143f5b203365e192bb02f344a7;p=pve-kernel.git

igb: add 4.12 compat patch
---

diff --git a/Makefile b/Makefile
index 4f12dfa..f970a16 100644
--- a/Makefile
+++ b/Makefile
@@ -254,6 +254,7 @@ igb.ko igb: .compile_mark ${IGBSRC}
 	tar xf ${IGBSRC}
 	[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
 	cd ${IGBDIR}; patch -p1 < ../patches/intel/igb/igb_4.10_max-mtu.patch
+	cd ${IGBDIR}; patch -p1 < ../patches/intel/igb/igb_4.12_compat.patch
 	cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
 	cp ${IGBDIR}/src/igb.ko igb.ko
 
diff --git a/patches/intel/igb/igb_4.12_compat.patch b/patches/intel/igb/igb_4.12_compat.patch
new file mode 100644
index 0000000..efbfda6
--- /dev/null
+++ b/patches/intel/igb/igb_4.12_compat.patch
@@ -0,0 +1,17 @@
+diff --git a/src/igb_main.c.orig b/src/igb_main.c
+index 3ee1ec7..c8adf04 100644
+--- a/src/igb_main.c.orig
++++ b/src/igb_main.c
+@@ -1047,8 +1047,10 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter, bool msix)
+ 			for (i = 0; i < numvecs; i++)
+ 				adapter->msix_entries[i].entry = i;
+ 
+-			err = pci_enable_msix(pdev,
+-					      adapter->msix_entries, numvecs);
++			err = pci_enable_msix_range(pdev,
++						    adapter->msix_entries,
++						    numvecs,
++						    numvecs);
+ 			if (err == 0)
+ 				break;
+ 		}