update igb module to 5.3.5.3

and add patch to skip kernel version check for backported
napi_consume_skb method

diff --git a/Makefile b/Makefile
index 70a3f6535c8ad43103f7cb48cb5d896a346c79a6..c663874b7d4f73a039de46b8fd5c27b134f91a08 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 E1000EDIR=e1000e-3.3.3
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.3.4.4
+IGBDIR=igb-5.3.5.3
 IGBSRC=${IGBDIR}.tar.gz
 
 IXGBEDIR=ixgbe-4.4.6
@@ -288,6 +288,7 @@ igb.ko igb: .compile_mark ${IGBSRC}
        rm -rf ${IGBDIR}
        tar xf ${IGBSRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       cd ${IGBDIR}; patch -p1 < ../igb-kcompat-version-check-fix.patch
        cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${IGBDIR}/src/igb.ko igb.ko
 

diff --git a/changelog.Debian b/changelog.Debian
index d4178d97963da803f73c841a5ac3510dfd37d91c..c6d9dbf4fbd0b3d44df919f54997d8e313412baf 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -8,6 +8,8 @@ pve-kernel (4.4.16-61) unstable; urgency=medium
 
   * EDAC, ie31200_edac: Add Skylake support
 
+  * update igb to 5.3.5.3
+
  -- Proxmox Support Team <support@proxmox.com>  Wed, 24 Aug 2016 15:08:27 +0200
 
 pve-kernel (4.4.15-60) unstable; urgency=medium

diff --git a/igb-kcompat-version-check-fix.patch b/igb-kcompat-version-check-fix.patch
new file mode 100644 (file)
index 0000000..8f72387
--- /dev/null
+++ b/igb-kcompat-version-check-fix.patch
@@ -0,0 +1,19 @@
+diff --git a/src/kcompat.h.orig b/src/kcompat.h
+index ceabd81..e1fa5ac 100644
+--- a/src/kcompat.h.orig
++++ b/src/kcompat.h
+@@ -4809,14 +4809,6 @@ static inline bool page_is_pfmemalloc(struct page __maybe_unused *page)
+ #endif /* 4.5.0 */
+ 
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0))
+-#if !(UBUNTU_VERSION_CODE && UBUNTU_VERSION_CODE >= UBUNTU_VERSION(4,4,0,21))
+-static inline void napi_consume_skb(struct sk_buff *skb,
+-                                  int __always_unused budget)
+-{
+-      dev_consume_skb_any(skb);
+-}
+-
+-#endif /* UBUNTU_VERSION(4,4,0,21) */
+ static inline void csum_replace_by_diff(__sum16 *sum, __wsum diff)
+ {
+       * sum = csum_fold(csum_add(diff, ~csum_unfold(*sum)));