From 2b30d36a92e4a559e5604f7359bb5bfd2d019ef2 Mon Sep 17 00:00:00 2001 From: yinbin6 Date: Tue, 25 Jun 2024 15:11:45 +0800 Subject: [PATCH] sync solve compile err in 20.03 (cherry picked from commit 6b3d9cd590497ddec11719b6300fbe2d5e1d10c8) --- 0197-solve-compile-err-in-20.03.patch | 39 +++++++++++++++++++++++++++ gazelle.spec | 6 ++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0197-solve-compile-err-in-20.03.patch diff --git a/0197-solve-compile-err-in-20.03.patch b/0197-solve-compile-err-in-20.03.patch new file mode 100644 index 0000000..1f5ccef --- /dev/null +++ b/0197-solve-compile-err-in-20.03.patch @@ -0,0 +1,39 @@ +From 7755b72b475fdb5fbd75f51cfb8dfd4a49b70852 Mon Sep 17 00:00:00 2001 +From: hantwofish +Date: Mon, 24 Jun 2024 15:26:31 +0800 +Subject: [PATCH] solve complie err in 20.03 RTE_ETHER_ADDR_PRT_FMT + RTE_ETHER_ADDR_BYTES are defined in dpdk 21.11 + +--- + src/lstack/include/lstack_virtio.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/lstack/include/lstack_virtio.h b/src/lstack/include/lstack_virtio.h +index 5e001ca..d40c754 100644 +--- a/src/lstack/include/lstack_virtio.h ++++ b/src/lstack/include/lstack_virtio.h +@@ -15,6 +15,21 @@ + #include + + #define VIRTIO_MAX_QUEUE_NUM 8 ++ ++// RTE_ETHER_ADDR_PRT_FMT RTE_ETHER_ADDR_BYTES are defined in dpdk 21.11 ++#ifndef RTE_ETHER_ADDR_PRT_FMT ++#define RTE_ETHER_ADDR_PRT_FMT "%02X:%02X:%02X:%02X:%02X:%02X" ++#endif ++ ++#ifndef RTE_ETHER_ADDR_BYTES ++#define RTE_ETHER_ADDR_BYTES(mac_addrs) ((mac_addrs)->addr_bytes[0]), \ ++ ((mac_addrs)->addr_bytes[1]), \ ++ ((mac_addrs)->addr_bytes[2]), \ ++ ((mac_addrs)->addr_bytes[3]), \ ++ ((mac_addrs)->addr_bytes[4]), \ ++ ((mac_addrs)->addr_bytes[5]) ++#endif ++ + struct virtio_instance { + uint16_t lstack_port_id; + uint16_t virtio_port_id; +-- +2.33.0 + diff --git a/gazelle.spec b/gazelle.spec index fd7cee6..407cbf3 100644 --- a/gazelle.spec +++ b/gazelle.spec @@ -2,7 +2,7 @@ Name: gazelle Version: 1.0.2 -Release: 42 +Release: 43 Summary: gazelle is a high performance user-mode stack License: MulanPSL-2.0 URL: https://gitee.com/openeuler/gazelle @@ -213,6 +213,7 @@ Patch9193: 0193-cfg-bond_slave_mac-support-pci-addr.patch Patch9194: 0194-refactor-tx-cache-module.patch Patch9195: 0195-virtio-create-and-init-virtio_port.patch Patch9196: 0196-refactor-udp-send.patch +Patch9197: 0197-solve-compile-err-in-20.03.patch %description %{name} is a high performance user-mode stack. @@ -254,6 +255,9 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b %config(noreplace) %{conf_path}/ltran.conf %changelog +* Tue Jun 25 2024 yinbin - 1.0.2-43 +- sync solve compile err in 20.03 + * Fri Jun 14 2024 jiangheng - 1.0.2-42 - refacotr udp send