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 73991A04C0 for ; Fri, 25 Sep 2020 15:10:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 593BA1E536; Fri, 25 Sep 2020 15:10:02 +0200 (CEST) Received: from mail-wm1-f66.google.com (unknown [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 2AA1C1E536 for ; Fri, 25 Sep 2020 15:09:40 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id v12so3232922wmh.3 for ; Fri, 25 Sep 2020 06:09:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=ZRqsOSchiMPzwLnCCj9lXVUoiMtGIEGH6gUXk//mn0A=; b=HKQuYWY897LBfA1Ijxhqp1VEcV543E9azULA+GrbbKoH4oFBQRBbVZlImCJ6I0yUZh hdy3jX5Kx2SqgJPjlp/5DhMJcpST2v+Ui1mN59eytlhCexRys0KsuSthLSkFsq7l1ZV5 FVw4dsUrbKWfRqX9rrsLfB5XSGNfVopxaujhXPBYpjiGCINxZkZhGLvsiHJugBwxfGDp i+os2YCoBOBjz3Yi/8o7vM254JF3/3z4BYbM32t/qe9W1gWEgNs8LUmKJ8Qy6U0xSk50 eHeEy0TArghng8VXfedZ0r8t2K9jHh/baLZsxsZC43dURdDMy3/NR14mLBVHP2n9XyZh +uuw== X-Gm-Message-State: AOAM531qhZovIT3G9+afShPo7wiv4YZznjfcgSb8q9zTtS2IDmoadGSO EaYbfIBza0Ts/SYZeiKL6Yk= X-Google-Smtp-Source: ABdhPJzEIDQWPjCmi/ggWwQJfsLgA883qvDFe/P0fMDDWqlJrJCdLjv81sFkhdn5A5bVN2np4H/ITg== X-Received: by 2002:a05:600c:2155:: with SMTP id v21mr3178696wml.118.1601039370718; Fri, 25 Sep 2020 06:09:30 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y207sm2930419wmc.17.2020.09.25.06.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 06:09:29 -0700 (PDT) Message-ID: <02fa64ac41afd6536e10df1414f9445f743a191d.camel@debian.org> From: Luca Boccassi To: Kevin Traynor , stable@dpdk.org Cc: Abhishek.Marathe@microsoft.com Date: Fri, 25 Sep 2020 14:09:28 +0100 In-Reply-To: <20200925130113.13877-2-ktraynor@redhat.com> References: <20200925130113.13877-1-ktraynor@redhat.com> <20200925130113.13877-2-ktraynor@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Subject: Re: [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" 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. >=20 > Extending compatibility for openSUSE 15.2. >=20 > 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(-) >=20 > diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/e= thtool/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 >=3D SLE_VERSION(15, 2, 0))) > frag->page_offset +=3D 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 >=3D SLE_VERSION(15, 2, 0))) > frag->page_offset +=3D pull_len; > #else Acked-by: Luca Boccassi --=20 Kind regards, Luca Boccassi