From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 65641A04C0 for ; Fri, 25 Sep 2020 15:01:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5E81A1C127; Fri, 25 Sep 2020 15:01:41 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 3956E1C227 for ; Fri, 25 Sep 2020 15:01:40 +0200 (CEST) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601038899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G9C2atAaq6aVzvNCs30l26Tn0ucTwnmy96mnuDucJhM=; b=fzsNqmWDCidbb09LO9fFaUH8ivmBI8vdrs2/5S0nUnMT51uqkQs6COtHXgIDym6+7UXJJE OE5jYULZAbiXlVrJ89/Mv9EOrM5pgALB9PJ8LhLUanjx6qu+tVjN6xss8DS4v9AcaH6lDE AX4fsTD51Ud1xQbVLXhbsUtDbxE3E/k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-523-YIdFjbWUNRCciQVSb7AZbg-1; Fri, 25 Sep 2020 09:01:37 -0400 X-MC-Unique: YIdFjbWUNRCciQVSb7AZbg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10BF7AD504; Fri, 25 Sep 2020 13:01:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.37.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA6FC5D9F3; Fri, 25 Sep 2020 13:01:31 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org Cc: Abhishek.Marathe@microsoft.com, bluca@debian.org, Kevin Traynor Date: Fri, 25 Sep 2020 14:01:13 +0100 Message-Id: <20200925130113.13877-2-ktraynor@redhat.com> In-Reply-To: <20200925130113.13877-1-ktraynor@redhat.com> References: <20200925130113.13877-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] [PATCH 18.11 2/2] kni: fix build error on openSuse 15.2 - skb_frag_t to bio_vec X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 Signed-off-by: Kevin Traynor --- 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 -- 2.26.2