From: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Date: Thu, 25 Aug 2016 09:03:20 +0000 (+0200)
Subject: update e1000e to 3.3.5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9a5ae2c026d9e7661418791cfb6d8a3e5267f09a;p=pve-kernel-jessie.git

update e1000e to 3.3.5

include kcompat patch already used for igb
---

diff --git a/Makefile b/Makefile
index 0c91107..5e9d434 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ FW_VER=1.1
 FW_REL=8
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
-E1000EDIR=e1000e-3.3.3
+E1000EDIR=e1000e-3.3.5
 E1000ESRC=${E1000EDIR}.tar.gz
 
 IGBDIR=igb-5.3.5.3
@@ -286,6 +286,8 @@ e1000e.ko e1000e: .compile_mark ${E1000ESRC}
 	rm -rf ${E1000EDIR}
 	tar xf ${E1000ESRC}
 	[ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+	# patch used for igb and e1000e!
+	cd ${E1000EDIR}; patch -p1 < ../igb_e1000e-kcompat-version-check-fix.patch
 	cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
 	cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
 
@@ -293,7 +295,8 @@ 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
+	# patch used for igb and e1000e!
+	cd ${IGBDIR}; patch -p1 < ../igb_e1000e-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 5ec64be..1810a9c 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -2,6 +2,8 @@ pve-kernel (4.4.16-62) unstable; urgency=medium
 
   * watchdog: mei_wdt: implement MEI iAMT watchdog driver
 
+  * update e1000e to 3.3.5
+
  -- Proxmox Support Team <support@proxmox.com>  Thu, 25 Aug 2016 09:37:56 +0200
 
 pve-kernel (4.4.16-61) unstable; urgency=medium
diff --git a/e1000e-3.3.3.tar.gz b/e1000e-3.3.3.tar.gz
deleted file mode 100644
index 6b645d1..0000000
Binary files a/e1000e-3.3.3.tar.gz and /dev/null differ
diff --git a/e1000e-3.3.5.tar.gz b/e1000e-3.3.5.tar.gz
new file mode 100644
index 0000000..9c543ad
Binary files /dev/null and b/e1000e-3.3.5.tar.gz differ
diff --git a/igb-kcompat-version-check-fix.patch b/igb-kcompat-version-check-fix.patch
deleted file mode 100644
index 8f72387..0000000
--- a/igb-kcompat-version-check-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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)));
diff --git a/igb_e1000e-kcompat-version-check-fix.patch b/igb_e1000e-kcompat-version-check-fix.patch
new file mode 100644
index 0000000..8f72387
--- /dev/null
+++ b/igb_e1000e-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)));