[dpdk-stable] [PATCH 18.11 2/2] kni: fix build error on openSuse 15.2 - skb_frag_t to bio_vec

[Luca Boccassi]

On Fri, 2020-09-25 at 14:01 +0100, Kevin Traynor wrote:
> Similar to
> commit bfeb0ca97244 ("kni: fix kernel 5.4 build - skb_frag_t to bio_vec")
> openSUSE LEAP 15.2 also needs to use the bio_vec struct.
> 
> Extending compatibility for openSUSE 15.2.
> 
> Reported-by: Abhishek Marathe <Abhishek.Marathe at microsoft.com>
> Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
> ---
>  kernel/linux/kni/ethtool/igb/igb_main.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/ethtool/igb/igb_main.c
> index 5a07d007a2..a3cb5ad708 100644
> --- a/kernel/linux/kni/ethtool/igb/igb_main.c
> +++ b/kernel/linux/kni/ethtool/igb/igb_main.c
> @@ -8261,5 +8261,6 @@ static void igb_pull_tail(struct igb_ring *rx_ring,
>  		/* update pointers to remove timestamp header */
>  		skb_frag_size_sub(frag, IGB_TS_HDR_LEN);
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
> +#if ((LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) \
> +	&& !(SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(15, 2, 0)))
>  		frag->page_offset += IGB_TS_HDR_LEN;
>  #else
> @@ -8285,5 +8286,6 @@ static void igb_pull_tail(struct igb_ring *rx_ring,
>  	/* update all of the pointers */
>  	skb_frag_size_sub(frag, pull_len);
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
> +#if ((LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)) \
> +	&& !(SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(15, 2, 0)))
>  	frag->page_offset += pull_len;
>  #else

Acked-by: Luca Boccassi <bluca at debian.org>

-- 
Kind regards,
Luca Boccassi