summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2022-05-12 10:24:52 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2022-05-19 19:15:07 +0800
commit09098721b1c78ee812ee287f6b366a47f4b5be87 (patch)
treed03503a3d956af60dd15e59db42a5d564ecc6da3
parentad5fdb707f44dddd276b864d2098c3abede90067 (diff)
downloadmeta-dpdk-09098721b1c78ee812ee287f6b366a47f4b5be87.tar.gz
dpdk-module: use netif_rx() instead of netif_rx_ni()
The netif_rx_ni is removed in below commit after kernel upgraded to 5.18, so use netif_rx() instead of netif_rx_ni() to fix the gap. 2655926aea9b net: Remove netif_rx_any_context() and netif_rx_ni(). Fixes: | TOPDIR/tmp-glibc/work/intel_x86_64-wrs-linux/dpdk-module/21.11.0-r0/git/kernel/linux/kni/kni_net.c: In function 'kni_net_rx_normal': | TOPDIR/tmp-glibc/work/intel_x86_64-wrs-linux/dpdk-module/21.11.0-r0/git/kernel/linux/kni/kni_net.c:444:17: error: implicit declaration of function 'netif_rx_ni'; did you mean 'netif_rx'? [-Werror=implicit-function-declaration] 444 | netif_rx_ni(skb); Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--recipes-extended/dpdk/dpdk-module_21.11.1.bb1
-rw-r--r--recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch30
2 files changed, 31 insertions, 0 deletions
diff --git a/recipes-extended/dpdk/dpdk-module_21.11.1.bb b/recipes-extended/dpdk/dpdk-module_21.11.1.bb
index 405dd3e..3089ec9 100644
--- a/recipes-extended/dpdk/dpdk-module_21.11.1.bb
+++ b/recipes-extended/dpdk/dpdk-module_21.11.1.bb
@@ -4,6 +4,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/dpdk:"
4 4
5SRC_URI += " \ 5SRC_URI += " \
6 file://0001-Makefile-add-makefile.patch \ 6 file://0001-Makefile-add-makefile.patch \
7 file://0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch \
7" 8"
8STABLE = "-stable" 9STABLE = "-stable"
9BRANCH = "21.11" 10BRANCH = "21.11"
diff --git a/recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch b/recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch
new file mode 100644
index 0000000..383d657
--- /dev/null
+++ b/recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch
@@ -0,0 +1,30 @@
1From 5c19a02979d3414f1326359494c1df38eac2730b Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 11 May 2022 17:47:09 +0800
4Subject: [PATCH] kni_net.c: use netif_rx() instead of netif_rx_ni()
5
6The netif_rx_ni is removed in below commit after kernel upgraded
7to 5.18, so change accordingly to fix the gap.
82655926aea9b net: Remove netif_rx_any_context() and netif_rx_ni().
9
10Upstream-Status: Submitted [https://mails.dpdk.org/archives/dev/2022-May/240924.html]
11
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13
14---
15 kernel/linux/kni/kni_net.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
19index 29e5b9e21f..e66b35314a 100644
20--- a/kernel/linux/kni/kni_net.c
21+++ b/kernel/linux/kni/kni_net.c
22@@ -441,7 +441,7 @@ kni_net_rx_normal(struct kni_dev *kni)
23 skb->ip_summed = CHECKSUM_UNNECESSARY;
24
25 /* Call netif interface */
26- netif_rx_ni(skb);
27+ netif_rx(skb);
28
29 /* Update statistics */
30 dev->stats.rx_bytes += len;