[pve-devel] Applied: Re: [PATCH kernel 2/2] update igb module to 5.3.5.3

[Fabian Grünbichler]

rebased and applied

On Tue, Aug 16, 2016 at 03:58:04PM +0200, Fabian Grünbichler wrote:
> and add patch to skip kernel version check for backported
> napi_consume_skb method
> ---
> igb-5.3.5.3.tar.gz available at https://downloadmirror.intel.com/13663/eng/igb-5.3.5.3.tar.gz
> SHA256: 4bee5e16cba82a390dc7ae6d930b0af0f6ac82939e7f17f1494ff8b59bbd62ba
> 
>  Makefile                            |   3 ++-
>  changelog.Debian                    |   2 ++
>  igb-5.3.4.4.tar.gz                  | Bin 321295 -> 0 bytes
>  igb-5.3.5.3.tar.gz                  | Bin 0 -> 322296 bytes
>  igb-kcompat-version-check-fix.patch |  19 +++++++++++++++++++
>  5 files changed, 23 insertions(+), 1 deletion(-)
>  delete mode 100644 igb-5.3.4.4.tar.gz
>  create mode 100644 igb-5.3.5.3.tar.gz
>  create mode 100644 igb-kcompat-version-check-fix.patch
> 
> diff --git a/Makefile b/Makefile
> index b6abf93..f9a7936 100644
> --- 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
> @@ -287,6 +287,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 ec8db92..305a12a 100644
> --- a/changelog.Debian
> +++ b/changelog.Debian
> @@ -6,6 +6,8 @@ pve-kernel (4.4.16-61) unstable; urgency=medium
>  
>    * drop ceph-scheduler-fix.patch (applied upstream)
>  
> +  * update igb to 5.3.5.3
> +
>   -- Proxmox Support Team <support at proxmox.com>  Tue, 16 Aug 2016 14:30:50 +0200
>  
>  pve-kernel (4.4.15-60) unstable; urgency=medium
> diff --git a/igb-5.3.4.4.tar.gz b/igb-5.3.4.4.tar.gz
> deleted file mode 100644
> index 251db36..0000000
> Binary files a/igb-5.3.4.4.tar.gz and /dev/null differ
> diff --git a/igb-5.3.5.3.tar.gz b/igb-5.3.5.3.tar.gz
> new file mode 100644
> index 0000000..7d9c9e3
> Binary files /dev/null and b/igb-5.3.5.3.tar.gz differ
> diff --git a/igb-kcompat-version-check-fix.patch b/igb-kcompat-version-check-fix.patch
> new file mode 100644
> 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)));
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel