diff options
-rw-r--r-- | recipes-extended/dpdk/dpdk-module_21.11.2.bb (renamed from recipes-extended/dpdk/dpdk-module_21.11.1.bb) | 3 | ||||
-rw-r--r-- | recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch | 30 |
2 files changed, 1 insertions, 32 deletions
diff --git a/recipes-extended/dpdk/dpdk-module_21.11.1.bb b/recipes-extended/dpdk/dpdk-module_21.11.2.bb index 3089ec9..d7ce6a0 100644 --- a/recipes-extended/dpdk/dpdk-module_21.11.1.bb +++ b/recipes-extended/dpdk/dpdk-module_21.11.2.bb | |||
@@ -4,11 +4,10 @@ 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 \ | ||
8 | " | 7 | " |
9 | STABLE = "-stable" | 8 | STABLE = "-stable" |
10 | BRANCH = "21.11" | 9 | BRANCH = "21.11" |
11 | SRCREV = "fcd039e4663bf2b595d7af3a8175a3e0bc09b367" | 10 | SRCREV = "7bcd45ce824d0ea2a9f30d16855613a93521851b" |
12 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
13 | 12 | ||
14 | inherit module | 13 | inherit module |
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 deleted file mode 100644 index 383d657..0000000 --- a/recipes-extended/dpdk/dpdk/0001-kni_net.c-use-netif_rx-instead-of-netif_rx_ni.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
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; | ||