diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2022-05-12 10:24:52 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2022-05-19 19:15:07 +0800 |
commit | 09098721b1c78ee812ee287f6b366a47f4b5be87 (patch) | |
tree | d03503a3d956af60dd15e59db42a5d564ecc6da3 | |
parent | ad5fdb707f44dddd276b864d2098c3abede90067 (diff) | |
download | meta-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.bb | 1 | ||||
-rw-r--r-- | recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch | 30 |
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 | ||
5 | SRC_URI += " \ | 5 | SRC_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 | " |
8 | STABLE = "-stable" | 9 | STABLE = "-stable" |
9 | BRANCH = "21.11" | 10 | 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 @@ | |||
1 | From 5c19a02979d3414f1326359494c1df38eac2730b Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Wed, 11 May 2022 17:47:09 +0800 | ||
4 | Subject: [PATCH] kni_net.c: use netif_rx() instead of netif_rx_ni() | ||
5 | |||
6 | The netif_rx_ni is removed in below commit after kernel upgraded | ||
7 | to 5.18, so change accordingly to fix the gap. | ||
8 | 2655926aea9b net: Remove netif_rx_any_context() and netif_rx_ni(). | ||
9 | |||
10 | Upstream-Status: Submitted [https://mails.dpdk.org/archives/dev/2022-May/240924.html] | ||
11 | |||
12 | Signed-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 | |||
18 | diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c | ||
19 | index 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; | ||