From 09098721b1c78ee812ee287f6b366a47f4b5be87 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 12 May 2022 10:24:52 +0800 Subject: 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 Signed-off-by: Anuj Mittal --- recipes-extended/dpdk/dpdk-module_21.11.1.bb | 1 + ...net.c-use-netif_rx-instead-of-netif_rx_ni.patch | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch 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:" SRC_URI += " \ file://0001-Makefile-add-makefile.patch \ + file://0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch \ " STABLE = "-stable" BRANCH = "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 @@ +From 5c19a02979d3414f1326359494c1df38eac2730b Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 11 May 2022 17:47:09 +0800 +Subject: [PATCH] kni_net.c: use netif_rx() instead of netif_rx_ni() + +The netif_rx_ni is removed in below commit after kernel upgraded +to 5.18, so change accordingly to fix the gap. +2655926aea9b net: Remove netif_rx_any_context() and netif_rx_ni(). + +Upstream-Status: Submitted [https://mails.dpdk.org/archives/dev/2022-May/240924.html] + +Signed-off-by: Mingli Yu + +--- + 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 29e5b9e21f..e66b35314a 100644 +--- a/kernel/linux/kni/kni_net.c ++++ b/kernel/linux/kni/kni_net.c +@@ -441,7 +441,7 @@ kni_net_rx_normal(struct kni_dev *kni) + skb->ip_summed = CHECKSUM_UNNECESSARY; + + /* Call netif interface */ +- netif_rx_ni(skb); ++ netif_rx(skb); + + /* Update statistics */ + dev->stats.rx_bytes += len; -- cgit v1.2.3-54-g00ecf