From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: daxuex.gao@intel.com, stable@dpdk.org,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,
Jiri Slaby <jslaby@suse.cz>
Subject: [PATCH] kni: fix build
Date: Mon, 6 Jun 2022 12:46:44 +0200 [thread overview]
Message-ID: <20220606104644.1477620-1-thomas@monjalon.net> (raw)
In-Reply-To: <88cd54ca-9318-d240-4ce9-2be8b13d19ad@oktetlabs.ru>
A previous fix had #else instead of #endif.
The error message is:
kernel/linux/kni/kni_net.c: In function ‘kni_net_rx_normal’:
kernel/linux/kni/kni_net.c:448:2: error: #else after #else
Bugzilla ID: 1025
Fixes: c98600d4bed6 ("kni: fix build with Linux 5.18")
Cc: stable@dpdk.org
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
kernel/linux/kni/kni_net.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index a8b092b756..41805fcabf 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -445,7 +445,7 @@ kni_net_rx_normal(struct kni_dev *kni)
netif_rx_ni(skb);
#else
netif_rx(skb);
-#else
+#endif
/* Update statistics */
dev->stats.rx_bytes += len;
--
2.36.0
next prev parent reply other threads:[~2022-06-06 10:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-25 10:12 [PATCH] kni: fix build with Linux 5.18 Jiri Slaby
2022-05-25 10:26 ` [PATCH v2] " Jiri Slaby
2022-05-31 16:25 ` Ferruh Yigit
2022-06-01 6:51 ` [PATCH v3] " Jiri Slaby
2022-06-01 6:53 ` [PATCH v4] " Jiri Slaby
2022-06-05 8:22 ` Andrew Rybchenko
2022-06-06 5:59 ` Jiri Slaby
2022-06-06 16:20 ` Andrew Rybchenko
2022-06-06 10:46 ` Thomas Monjalon [this message]
2022-06-05 7:54 ` [PATCH v3] " Andrew Rybchenko
2022-06-05 8:20 ` Andrew Rybchenko
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=20220606104644.1477620-1-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=daxuex.gao@intel.com \
--cc=dev@dpdk.org \
--cc=jslaby@suse.cz \
--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).