From: Kevin Traynor <ktraynor@redhat.com>
To: stable@dpdk.org
Cc: Abhishek.Marathe@microsoft.com, bluca@debian.org,
Kevin Traynor <ktraynor@redhat.com>
Subject: [dpdk-stable] [PATCH 18.11 2/2] kni: fix build error on openSuse 15.2 - skb_frag_t to bio_vec
Date: Fri, 25 Sep 2020 14:01:13 +0100 [thread overview]
Message-ID: <20200925130113.13877-2-ktraynor@redhat.com> (raw)
In-Reply-To: <20200925130113.13877-1-ktraynor@redhat.com>
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@microsoft.com>
Signed-off-by: Kevin Traynor <ktraynor@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
--
2.26.2
next prev parent reply other threads:[~2020-09-25 13:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 13:01 [dpdk-stable] [PATCH 18.11 1/2] kni: fix build error on openSUSE 15.2 - pci clearing Kevin Traynor
2020-09-25 13:01 ` Kevin Traynor [this message]
2020-09-25 13:09 ` [dpdk-stable] [PATCH 18.11 2/2] kni: fix build error on openSuse 15.2 - skb_frag_t to bio_vec Luca Boccassi
2020-09-28 9:05 ` Kevin Traynor
2020-09-25 13:09 ` [dpdk-stable] [PATCH 18.11 1/2] kni: fix build error on openSUSE 15.2 - pci clearing Luca Boccassi
2020-09-28 9:05 ` Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200925130113.13877-2-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=Abhishek.Marathe@microsoft.com \
--cc=bluca@debian.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).