[pve-devel] [PATCH kernel 09/17] update e1000e to 3.3.5.3

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 Makefile                                   |   4 +---
 igb_e1000e-kcompat-version-check-fix.patch |  19 -------------------
 e1000e-3.3.5.3.tar.gz                      | Bin 0 -> 294387 bytes
 e1000e-3.3.5.tar.gz                        | Bin 292240 -> 0 bytes
 4 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 igb_e1000e-kcompat-version-check-fix.patch
 create mode 100644 e1000e-3.3.5.3.tar.gz
 delete mode 100644 e1000e-3.3.5.tar.gz

diff --git a/Makefile b/Makefile
index e0cc16f..e72e496 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ FW_VER=1.1
 FW_REL=11
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
-E1000EDIR=e1000e-3.3.5
+E1000EDIR=e1000e-3.3.5.3
 E1000ESRC=${E1000EDIR}.tar.gz
 
 IGBDIR=igb-5.3.5.3
@@ -282,8 +282,6 @@ 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
 
diff --git a/igb_e1000e-kcompat-version-check-fix.patch b/igb_e1000e-kcompat-version-check-fix.patch
deleted file mode 100644
index 8f72387..0000000
--- a/igb_e1000e-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/e1000e-3.3.5.3.tar.gz b/e1000e-3.3.5.3.tar.gz
new file mode 100644
index 0000000..c67490d
Binary files /dev/null and b/e1000e-3.3.5.3.tar.gz differ
diff --git a/e1000e-3.3.5.tar.gz b/e1000e-3.3.5.tar.gz
deleted file mode 100644
index 9c543ad..0000000
Binary files a/e1000e-3.3.5.tar.gz and /dev/null differ
-- 
2.1.4