From: luca.boccassi@gmail.com
To: Ferruh Yigit <ferruh.yigit@amd.com>
Cc: "Morten Brørup" <mb@smartsharesystems.com>,
"Bruce Richardson" <bruce.richardson@intel.com>,
"Andrew Rybchenko" <andrew.rybchenko@oktetlabs.ru>,
"Dariusz Sosnowski" <dsosnowski@nvidia.com>,
"dpdk stable" <stable@dpdk.org>
Subject: patch 'ethdev: convert string initialization' has been queued to stable release 22.11.8
Date: Mon, 17 Feb 2025 17:04:52 +0000 [thread overview]
Message-ID: <20250217170456.1068278-79-luca.boccassi@gmail.com> (raw)
In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com>
Hi,
FYI, your patch has been queued to stable release 22.11.8
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/19/25. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/2faec7a700bc720aa7ef419a05a41cd04a336ae3
Thanks.
Luca Boccassi
---
From 2faec7a700bc720aa7ef419a05a41cd04a336ae3 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@amd.com>
Date: Thu, 3 Oct 2024 21:13:34 -0700
Subject: [PATCH] ethdev: convert string initialization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[ upstream commit e0d947a1e6c2f80aa039a4f7082a8aa16797d8b9 ]
gcc 15 experimental [1], with -Wextra flag, gives warning in variable
initialization as string [2].
The warning has a point when initialized variable is intended to use as
string, since assignment is missing the required null terminator for
this case. But warning is useless for our usecase.
In this patch only updated a few instance to show the issue, there are
many instances to fix, if we prefer to go this way.
Other option is to disable warning but it can be useful for actual
string usecases, so I prefer to keep it.
Converted string initialization to array initialization.
[1]
gcc (GCC) 15.0.0 20241003 (experimental)
[2]
../lib/ethdev/rte_flow.h:906:36:
error: initializer-string for array of ‘unsigned char’ is too long
[-Werror=unterminated-string-initialization]
906 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
../lib/ethdev/rte_flow.h:907:36:
error: initializer-string for array of ‘unsigned char’ is too long
[-Werror=unterminated-string-initialization]
907 | .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
../lib/ethdev/rte_flow.h:1009:25:
error: initializer-string for array of ‘unsigned char’ is too long
[-Werror=unterminated-string-initialization]
1009 | "\xff\xff\xff\xff\xff\xff\xff\xff"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../lib/ethdev/rte_flow.h:1012:25:
error: initializer-string for array of ‘unsigned char’ is too long
[-Werror=unterminated-string-initialization]
1012 | "\xff\xff\xff\xff\xff\xff\xff\xff"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../lib/ethdev/rte_flow.h:1135:20:
error: initializer-string for array of ‘unsigned char’ is too long
[-Werror=unterminated-string-initialization]
1135 | .hdr.vni = "\xff\xff\xff",
| ^~~~~~~~~~~~~~
Signed-off-by: Ferruh Yigit <ferruh.yigit@amd.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Acked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
---
app/test-pmd/cmdline_flow.c | 31 +++++++++--------
app/test/test_bpf.c | 2 +-
app/test/test_pcapng.c | 2 +-
doc/guides/prog_guide/rte_flow.rst | 2 +-
drivers/net/cxgbe/cxgbe_flow.c | 14 ++++----
drivers/net/dpaa2/dpaa2_flow.c | 14 ++++----
drivers/net/mlx4/mlx4_flow.c | 6 ++--
drivers/net/mlx5/mlx5_flow.c | 18 +++++-----
drivers/net/mlx5/mlx5_flow_dv.c | 24 ++++++-------
drivers/net/mlx5/mlx5_flow_hw.c | 56 +++++++++++++++---------------
drivers/net/mlx5/mlx5_trigger.c | 20 +++++------
drivers/net/nfp/nfp_flow.c | 14 ++++----
drivers/net/tap/tap_flow.c | 30 +++++++---------
lib/ethdev/rte_flow.h | 44 +++++++++++------------
14 files changed, 131 insertions(+), 146 deletions(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index a0a7d3da14..619656363f 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -690,20 +690,20 @@ struct vxlan_encap_conf vxlan_encap_conf = {
.select_ipv4 = 1,
.select_vlan = 0,
.select_tos_ttl = 0,
- .vni = "\x00\x00\x00",
+ .vni = { 0x00, 0x00, 0x00 },
.udp_src = 0,
.udp_dst = RTE_BE16(RTE_VXLAN_DEFAULT_PORT),
.ipv4_src = RTE_IPV4(127, 0, 0, 1),
.ipv4_dst = RTE_IPV4(255, 255, 255, 255),
- .ipv6_src = "\x00\x00\x00\x00\x00\x00\x00\x00"
- "\x00\x00\x00\x00\x00\x00\x00\x01",
- .ipv6_dst = "\x00\x00\x00\x00\x00\x00\x00\x00"
- "\x00\x00\x00\x00\x00\x00\x11\x11",
+ .ipv6_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+ .ipv6_dst = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11 },
.vlan_tci = 0,
.ip_tos = 0,
.ip_ttl = 255,
- .eth_src = "\x00\x00\x00\x00\x00\x00",
- .eth_dst = "\xff\xff\xff\xff\xff\xff",
+ .eth_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .eth_dst = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
};
/** Maximum number of items in struct rte_flow_action_vxlan_encap. */
@@ -726,16 +726,16 @@ struct action_vxlan_encap_data {
struct nvgre_encap_conf nvgre_encap_conf = {
.select_ipv4 = 1,
.select_vlan = 0,
- .tni = "\x00\x00\x00",
+ .tni = { 0x00, 0x00, 0x00 },
.ipv4_src = RTE_IPV4(127, 0, 0, 1),
.ipv4_dst = RTE_IPV4(255, 255, 255, 255),
- .ipv6_src = "\x00\x00\x00\x00\x00\x00\x00\x00"
- "\x00\x00\x00\x00\x00\x00\x00\x01",
- .ipv6_dst = "\x00\x00\x00\x00\x00\x00\x00\x00"
- "\x00\x00\x00\x00\x00\x00\x11\x11",
+ .ipv6_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+ .ipv6_dst = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11 },
.vlan_tci = 0,
- .eth_src = "\x00\x00\x00\x00\x00\x00",
- .eth_dst = "\xff\xff\xff\xff\xff\xff",
+ .eth_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .eth_dst = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
};
/** Maximum number of items in struct rte_flow_action_nvgre_encap. */
@@ -6519,7 +6519,8 @@ parse_prefix(struct context *ctx, const struct token *token,
void *buf, unsigned int size)
{
const struct arg *arg = pop_args(ctx);
- static const uint8_t conv[] = "\x00\x80\xc0\xe0\xf0\xf8\xfc\xfe\xff";
+ static const uint8_t conv[] = { 0x00, 0x80, 0xc0, 0xe0, 0xf0,
+ 0xf8, 0xfc, 0xfe, 0xff };
char *end;
uintmax_t u;
unsigned int bytes;
diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index 51184341c2..3d174d09cb 100644
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -3347,7 +3347,7 @@ test_bpf_filter_sanity(pcap_t *pcap)
hdr = rte_pktmbuf_mtod(m, typeof(hdr));
hdr->eth_hdr = (struct rte_ether_hdr) {
- .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4),
};
hdr->ip_hdr = (struct rte_ipv4_hdr) {
diff --git a/app/test/test_pcapng.c b/app/test/test_pcapng.c
index e9c85f2e02..3f98a7e40f 100644
--- a/app/test/test_pcapng.c
+++ b/app/test/test_pcapng.c
@@ -63,7 +63,7 @@ mbuf1_prepare(struct dummy_mbuf *dm, uint32_t plen)
struct rte_ipv4_hdr ip;
} pkt = {
.eth = {
- .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4),
},
.ip = {
diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst
index d0b7833a2f..28f60eda37 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -3499,7 +3499,7 @@ For example, to create a pattern template to match on the destination MAC:
const struct rte_flow_pattern_template_attr attr = {.ingress = 1};
struct rte_flow_item_eth eth_m = {
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff";
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
};
struct rte_flow_item pattern[] = {
[0] = {.type = RTE_FLOW_ITEM_TYPE_ETH,
diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c
index d66672a9e6..468e88a617 100644
--- a/drivers/net/cxgbe/cxgbe_flow.c
+++ b/drivers/net/cxgbe/cxgbe_flow.c
@@ -889,8 +889,8 @@ static struct chrte_fparse parseitem[] = {
[RTE_FLOW_ITEM_TYPE_ETH] = {
.fptr = ch_rte_parsetype_eth,
.dmask = &(const struct rte_flow_item_eth){
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0xffff,
}
},
@@ -918,12 +918,10 @@ static struct chrte_fparse parseitem[] = {
.fptr = ch_rte_parsetype_ipv6,
.dmask = &(const struct rte_flow_item_ipv6) {
.hdr = {
- .src_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
- .dst_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.vtc_flow = RTE_BE32(0xff000000),
},
},
diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c
index df06c3862e..3aeb318049 100644
--- a/drivers/net/dpaa2/dpaa2_flow.c
+++ b/drivers/net/dpaa2/dpaa2_flow.c
@@ -100,8 +100,8 @@ enum rte_flow_action_type dpaa2_supported_fs_action_type[] = {
#ifndef __cplusplus
static const struct rte_flow_item_eth dpaa2_flow_item_eth_mask = {
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .src.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .src.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.type = RTE_BE16(0xffff),
};
@@ -117,12 +117,10 @@ static const struct rte_flow_item_ipv4 dpaa2_flow_item_ipv4_mask = {
static const struct rte_flow_item_ipv6 dpaa2_flow_item_ipv6_mask = {
.hdr = {
- .src_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
- .dst_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.proto = 0xff
},
};
diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c
index 9d7247cf81..f35b0d25f7 100644
--- a/drivers/net/mlx4/mlx4_flow.c
+++ b/drivers/net/mlx4/mlx4_flow.c
@@ -582,7 +582,7 @@ static const struct mlx4_flow_proc_item mlx4_flow_proc_item_list[] = {
RTE_FLOW_ITEM_TYPE_IPV4),
.mask_support = &(const struct rte_flow_item_eth){
/* Only destination MAC can be matched. */
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
},
.mask_default = &rte_flow_item_eth_mask,
.mask_sz = sizeof(struct rte_flow_item_eth),
@@ -1304,10 +1304,10 @@ mlx4_flow_internal(struct mlx4_priv *priv, struct rte_flow_error *error)
};
struct rte_flow_item_eth eth_spec;
const struct rte_flow_item_eth eth_mask = {
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
};
const struct rte_flow_item_eth eth_allmulti = {
- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
};
struct rte_flow_item_vlan vlan_spec;
const struct rte_flow_item_vlan vlan_mask = {
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 6fe51f70a8..ea637ea9b0 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2444,8 +2444,8 @@ mlx5_flow_validate_item_eth(const struct rte_flow_item *item,
{
const struct rte_flow_item_eth *mask = item->mask;
const struct rte_flow_item_eth nic_mask = {
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .src.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .src.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.type = RTE_BE16(0xffff),
.has_vlan = ext_vlan_sup ? 1 : 0,
};
@@ -2707,12 +2707,10 @@ mlx5_flow_validate_item_ipv6(const struct rte_flow_item *item,
const struct rte_flow_item_ipv6 *spec = item->spec;
const struct rte_flow_item_ipv6 nic_mask = {
.hdr = {
- .src_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
- .dst_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.vtc_flow = RTE_BE32(0xffffffff),
.proto = 0xff,
},
@@ -2932,7 +2930,7 @@ mlx5_flow_validate_item_vxlan(struct rte_eth_dev *dev,
uint8_t vni[4];
} id = { .vlan_id = 0, };
const struct rte_flow_item_vxlan nic_mask = {
- .vni = "\xff\xff\xff",
+ .vni = { 0xff, 0xff, 0xff },
.rsvd1 = 0xff,
};
const struct rte_flow_item_vxlan *valid_mask;
@@ -3314,7 +3312,7 @@ mlx5_flow_validate_item_geneve(const struct rte_flow_item *item,
MLX5_GENEVE_OPT_LEN_1 : MLX5_GENEVE_OPT_LEN_0;
const struct rte_flow_item_geneve nic_mask = {
.ver_opt_len_o_c_rsvd0 = RTE_BE16(0x3f80),
- .vni = "\xff\xff\xff",
+ .vni = { 0xff, 0xff, 0xff },
.protocol = RTE_BE16(UINT16_MAX),
};
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 7e9c22acb2..df437aba38 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -7082,11 +7082,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
const struct rte_flow_item_ipv6 nic_ipv6_mask = {
.hdr = {
.src_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
+ { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.dst_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
+ { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.vtc_flow = RTE_BE32(0xffffffff),
.proto = 0xff,
.hop_limits = 0xff,
@@ -8563,8 +8563,8 @@ flow_dv_translate_item_eth(void *key, const struct rte_flow_item *item,
const struct rte_flow_item_eth *eth_m;
const struct rte_flow_item_eth *eth_v;
const struct rte_flow_item_eth nic_mask = {
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .src.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .src.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.type = RTE_BE16(0xffff),
.has_vlan = 0,
};
@@ -8821,12 +8821,10 @@ flow_dv_translate_item_ipv6(void *key, const struct rte_flow_item *item,
const struct rte_flow_item_ipv6 *ipv6_v;
const struct rte_flow_item_ipv6 nic_mask = {
.hdr = {
- .src_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
- .dst_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.vtc_flow = RTE_BE32(0xffffffff),
.proto = 0xff,
.hop_limits = 0xff,
@@ -9340,7 +9338,7 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev,
int i;
struct mlx5_priv *priv = dev->data->dev_private;
const struct rte_flow_item_vxlan nic_mask = {
- .vni = "\xff\xff\xff",
+ .vni = { 0xff, 0xff, 0xff },
.rsvd1 = 0xff,
};
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 42d5d6ada6..a19342a25d 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -106,67 +106,67 @@ static uint32_t mlx5_hw_act_flag[MLX5_HW_ACTION_FLAG_MAX]
/* Ethernet item spec for promiscuous mode. */
static const struct rte_flow_item_eth ctrl_rx_eth_promisc_spec = {
- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
/* Ethernet item mask for promiscuous mode. */
static const struct rte_flow_item_eth ctrl_rx_eth_promisc_mask = {
- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
/* Ethernet item spec for all multicast mode. */
static const struct rte_flow_item_eth ctrl_rx_eth_mcast_spec = {
- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
/* Ethernet item mask for all multicast mode. */
static const struct rte_flow_item_eth ctrl_rx_eth_mcast_mask = {
- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
/* Ethernet item spec for IPv4 multicast traffic. */
static const struct rte_flow_item_eth ctrl_rx_eth_ipv4_mcast_spec = {
- .dst.addr_bytes = "\x01\x00\x5e\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
/* Ethernet item mask for IPv4 multicast traffic. */
static const struct rte_flow_item_eth ctrl_rx_eth_ipv4_mcast_mask = {
- .dst.addr_bytes = "\xff\xff\xff\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
/* Ethernet item spec for IPv6 multicast traffic. */
static const struct rte_flow_item_eth ctrl_rx_eth_ipv6_mcast_spec = {
- .dst.addr_bytes = "\x33\x33\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
/* Ethernet item mask for IPv6 multicast traffic. */
static const struct rte_flow_item_eth ctrl_rx_eth_ipv6_mcast_mask = {
- .dst.addr_bytes = "\xff\xff\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
/* Ethernet item mask for unicast traffic. */
static const struct rte_flow_item_eth ctrl_rx_eth_dmac_mask = {
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
/* Ethernet item spec for broadcast. */
static const struct rte_flow_item_eth ctrl_rx_eth_bcast_spec = {
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
@@ -5841,8 +5841,8 @@ flow_hw_create_tx_default_mreg_copy_pattern_template(struct rte_eth_dev *dev,
.egress = 1,
};
struct rte_flow_item_eth promisc = {
- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
struct rte_flow_item eth_all[] = {
@@ -5879,8 +5879,8 @@ flow_hw_create_lacp_rx_pattern_template(struct rte_eth_dev *dev, struct rte_flow
.ingress = 1,
};
struct rte_flow_item_eth lacp_mask = {
- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0xFFFF,
};
struct rte_flow_item eth_all[] = {
@@ -9320,8 +9320,8 @@ mlx5_flow_hw_create_tx_default_mreg_copy_flow(struct rte_eth_dev *dev)
{
struct mlx5_priv *priv = dev->data->dev_private;
struct rte_flow_item_eth promisc = {
- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
struct rte_flow_item eth_all[] = {
@@ -9659,7 +9659,7 @@ __flow_hw_ctrl_flows_unicast(struct rte_eth_dev *dev,
.type = MLX5_HW_CTRL_FLOW_TYPE_DEFAULT_RX_RSS,
};
const struct rte_ether_addr cmp = {
- .addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
};
unsigned int i;
@@ -9705,7 +9705,7 @@ __flow_hw_ctrl_flows_unicast_vlan(struct rte_eth_dev *dev,
.type = MLX5_HW_CTRL_FLOW_TYPE_DEFAULT_RX_RSS,
};
const struct rte_ether_addr cmp = {
- .addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
};
unsigned int i;
unsigned int j;
diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 1cb0b56ae1..13152d488e 100644
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -1562,23 +1562,23 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
{
struct mlx5_priv *priv = dev->data->dev_private;
struct rte_flow_item_eth bcast = {
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
};
struct rte_flow_item_eth ipv6_multi_spec = {
- .dst.addr_bytes = "\x33\x33\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
};
struct rte_flow_item_eth ipv6_multi_mask = {
- .dst.addr_bytes = "\xff\xff\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
};
struct rte_flow_item_eth unicast = {
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
};
struct rte_flow_item_eth unicast_mask = {
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
};
const unsigned int vlan_filter_n = priv->vlan_filter_n;
const struct rte_ether_addr cmp = {
- .addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
};
unsigned int i;
unsigned int j;
@@ -1647,8 +1647,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
return 0;
if (dev->data->promiscuous) {
struct rte_flow_item_eth promisc = {
- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
@@ -1658,8 +1658,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
}
if (dev->data->all_multicast) {
struct rte_flow_item_eth multicast = {
- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
.type = 0,
};
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 3746aa2d0f..d76bb15d91 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -1679,8 +1679,8 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {
RTE_FLOW_ITEM_TYPE_IPV6),
.mask_support = &(const struct rte_flow_item_eth){
.hdr = {
- .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.ether_type = RTE_BE16(0xffff),
},
.has_vlan = 1,
@@ -1732,10 +1732,10 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {
.vtc_flow = RTE_BE32(0x0ff00000),
.proto = 0xff,
.hop_limits = 0xff,
- .src_addr = "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
- .dst_addr = "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
},
.has_frag_ext = 1,
},
@@ -1793,7 +1793,7 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {
[RTE_FLOW_ITEM_TYPE_GENEVE] = {
.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH),
.mask_support = &(const struct rte_flow_item_geneve){
- .vni = "\xff\xff\xff",
+ .vni = { 0xff, 0xff, 0xff },
},
.mask_default = &rte_flow_item_geneve_mask,
.mask_sz = sizeof(struct rte_flow_item_geneve),
diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c
index 7468c3f0ea..ea23841f60 100644
--- a/drivers/net/tap/tap_flow.c
+++ b/drivers/net/tap/tap_flow.c
@@ -259,8 +259,8 @@ static const struct tap_flow_items tap_flow_items[] = {
RTE_FLOW_ITEM_TYPE_IPV4,
RTE_FLOW_ITEM_TYPE_IPV6),
.mask = &(const struct rte_flow_item_eth){
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .src.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .src.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.type = -1,
},
.mask_sz = sizeof(struct rte_flow_item_eth),
@@ -302,14 +302,10 @@ static const struct tap_flow_items tap_flow_items[] = {
RTE_FLOW_ITEM_TYPE_TCP),
.mask = &(const struct rte_flow_item_ipv6){
.hdr = {
- .src_addr = {
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
- },
- .dst_addr = {
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
- },
+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.proto = -1,
},
},
@@ -392,7 +388,7 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
.items[0] = {
.type = RTE_FLOW_ITEM_TYPE_ETH,
.mask = &(const struct rte_flow_item_eth){
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
},
},
.items[1] = {
@@ -409,10 +405,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
.items[0] = {
.type = RTE_FLOW_ITEM_TYPE_ETH,
.mask = &(const struct rte_flow_item_eth){
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
},
.spec = &(const struct rte_flow_item_eth){
- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
},
},
.items[1] = {
@@ -429,10 +425,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
.items[0] = {
.type = RTE_FLOW_ITEM_TYPE_ETH,
.mask = &(const struct rte_flow_item_eth){
- .dst.addr_bytes = "\x33\x33\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
},
.spec = &(const struct rte_flow_item_eth){
- .dst.addr_bytes = "\x33\x33\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
},
},
.items[1] = {
@@ -463,10 +459,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
.items[0] = {
.type = RTE_FLOW_ITEM_TYPE_ETH,
.mask = &(const struct rte_flow_item_eth){
- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
},
.spec = &(const struct rte_flow_item_eth){
- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
},
},
.items[1] = {
diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
index 706ffba596..e1aad5a98a 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -774,8 +774,8 @@ struct rte_flow_item_eth {
/** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */
#ifndef __cplusplus
static const struct rte_flow_item_eth rte_flow_item_eth_mask = {
- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.hdr.ether_type = RTE_BE16(0x0000),
};
#endif
@@ -877,12 +877,10 @@ struct rte_flow_item_ipv6 {
#ifndef __cplusplus
static const struct rte_flow_item_ipv6 rte_flow_item_ipv6_mask = {
.hdr = {
- .src_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
- .dst_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
},
};
#endif
@@ -1041,7 +1039,7 @@ struct rte_flow_item_nvgre {
/** Default mask for RTE_FLOW_ITEM_TYPE_NVGRE. */
#ifndef __cplusplus
static const struct rte_flow_item_nvgre rte_flow_item_nvgre_mask = {
- .tni = "\xff\xff\xff",
+ .tni = { 0xff, 0xff, 0xff },
};
#endif
@@ -1061,7 +1059,7 @@ struct rte_flow_item_mpls {
/** Default mask for RTE_FLOW_ITEM_TYPE_MPLS. */
#ifndef __cplusplus
static const struct rte_flow_item_mpls rte_flow_item_mpls_mask = {
- .label_tc_s = "\xff\xff\xf0",
+ .label_tc_s = { 0xff, 0xff, 0xf0 },
};
#endif
@@ -1196,7 +1194,7 @@ struct rte_flow_item_geneve {
/** Default mask for RTE_FLOW_ITEM_TYPE_GENEVE. */
#ifndef __cplusplus
static const struct rte_flow_item_geneve rte_flow_item_geneve_mask = {
- .vni = "\xff\xff\xff",
+ .vni = { 0xff, 0xff, 0xff },
};
#endif
@@ -1216,7 +1214,7 @@ struct rte_flow_item_vxlan_gpe {
/** Default mask for RTE_FLOW_ITEM_TYPE_VXLAN_GPE. */
#ifndef __cplusplus
static const struct rte_flow_item_vxlan_gpe rte_flow_item_vxlan_gpe_mask = {
- .vni = "\xff\xff\xff",
+ .vni = { 0xff, 0xff, 0xff },
};
#endif
@@ -1241,10 +1239,10 @@ struct rte_flow_item_arp_eth_ipv4 {
#ifndef __cplusplus
static const struct rte_flow_item_arp_eth_ipv4
rte_flow_item_arp_eth_ipv4_mask = {
- .sha.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .spa = RTE_BE32(0xffffffff),
- .tha.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .tpa = RTE_BE32(0xffffffff),
+ .sha.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .spa = RTE_BE32(UINT32_MAX),
+ .tha.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .tpa = RTE_BE32(UINT32_MAX),
};
#endif
@@ -1320,9 +1318,8 @@ struct rte_flow_item_icmp6_nd_ns {
#ifndef __cplusplus
static const
struct rte_flow_item_icmp6_nd_ns rte_flow_item_icmp6_nd_ns_mask = {
- .target_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
+ .target_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
};
#endif
@@ -1347,9 +1344,8 @@ struct rte_flow_item_icmp6_nd_na {
#ifndef __cplusplus
static const
struct rte_flow_item_icmp6_nd_na rte_flow_item_icmp6_nd_na_mask = {
- .target_addr =
- "\xff\xff\xff\xff\xff\xff\xff\xff"
- "\xff\xff\xff\xff\xff\xff\xff\xff",
+ .target_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
};
#endif
@@ -1398,7 +1394,7 @@ struct rte_flow_item_icmp6_nd_opt_sla_eth {
#ifndef __cplusplus
static const struct rte_flow_item_icmp6_nd_opt_sla_eth
rte_flow_item_icmp6_nd_opt_sla_eth_mask = {
- .sla.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .sla.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
};
#endif
@@ -1423,7 +1419,7 @@ struct rte_flow_item_icmp6_nd_opt_tla_eth {
#ifndef __cplusplus
static const struct rte_flow_item_icmp6_nd_opt_tla_eth
rte_flow_item_icmp6_nd_opt_tla_eth_mask = {
- .tla.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .tla.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
};
#endif
--
2.47.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-02-17 16:13:19.602554183 +0000
+++ 0079-ethdev-convert-string-initialization.patch 2025-02-17 16:13:16.910441591 +0000
@@ -1 +1 @@
-From e0d947a1e6c2f80aa039a4f7082a8aa16797d8b9 Mon Sep 17 00:00:00 2001
+From 2faec7a700bc720aa7ef419a05a41cd04a336ae3 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit e0d947a1e6c2f80aa039a4f7082a8aa16797d8b9 ]
+
@@ -63,18 +65,15 @@
- app/test-pmd/cmdline_flow.c | 31 ++++-----
- app/test/test_bpf.c | 2 +-
- app/test/test_pcapng.c | 2 +-
- app/test/test_security_inline_macsec.c | 4 +-
- doc/guides/prog_guide/ethdev/flow_offload.rst | 2 +-
- drivers/net/cxgbe/cxgbe_flow.c | 14 ++--
- drivers/net/dpaa2/dpaa2_flow.c | 14 ++--
- drivers/net/mlx4/mlx4_flow.c | 6 +-
- drivers/net/mlx5/mlx5_flow.c | 20 +++---
- drivers/net/mlx5/mlx5_flow_dv.c | 26 ++++----
- drivers/net/mlx5/mlx5_flow_hw.c | 66 +++++++++----------
- drivers/net/mlx5/mlx5_trigger.c | 20 +++---
- drivers/net/nfp/flower/nfp_flower_flow.c | 14 ++--
- drivers/net/nfp/nfp_net_flow.c | 8 +--
- drivers/net/tap/tap_flow.c | 30 ++++-----
- examples/l2fwd-macsec/main.c | 4 +-
- lib/ethdev/rte_flow.h | 44 ++++++-------
- 17 files changed, 144 insertions(+), 163 deletions(-)
+ app/test-pmd/cmdline_flow.c | 31 +++++++++--------
+ app/test/test_bpf.c | 2 +-
+ app/test/test_pcapng.c | 2 +-
+ doc/guides/prog_guide/rte_flow.rst | 2 +-
+ drivers/net/cxgbe/cxgbe_flow.c | 14 ++++----
+ drivers/net/dpaa2/dpaa2_flow.c | 14 ++++----
+ drivers/net/mlx4/mlx4_flow.c | 6 ++--
+ drivers/net/mlx5/mlx5_flow.c | 18 +++++-----
+ drivers/net/mlx5/mlx5_flow_dv.c | 24 ++++++-------
+ drivers/net/mlx5/mlx5_flow_hw.c | 56 +++++++++++++++---------------
+ drivers/net/mlx5/mlx5_trigger.c | 20 +++++------
+ drivers/net/nfp/nfp_flow.c | 14 ++++----
+ drivers/net/tap/tap_flow.c | 30 +++++++---------
+ lib/ethdev/rte_flow.h | 44 +++++++++++------------
+ 14 files changed, 131 insertions(+), 146 deletions(-)
@@ -83 +82 @@
-index b7bcf18311..5451b3a453 100644
+index a0a7d3da14..619656363f 100644
@@ -86 +85 @@
-@@ -898,20 +898,20 @@ struct vxlan_encap_conf vxlan_encap_conf = {
+@@ -690,20 +690,20 @@ struct vxlan_encap_conf vxlan_encap_conf = {
@@ -114 +113 @@
-@@ -934,16 +934,16 @@ struct action_vxlan_encap_data {
+@@ -726,16 +726,16 @@ struct action_vxlan_encap_data {
@@ -138 +137 @@
-@@ -8304,7 +8304,8 @@ parse_prefix(struct context *ctx, const struct token *token,
+@@ -6519,7 +6519,8 @@ parse_prefix(struct context *ctx, const struct token *token,
@@ -149 +148 @@
-index 7819d6aba9..90e10d7d2c 100644
+index 51184341c2..3d174d09cb 100644
@@ -152 +151 @@
-@@ -3361,7 +3361,7 @@ test_bpf_filter_sanity(pcap_t *pcap)
+@@ -3347,7 +3347,7 @@ test_bpf_filter_sanity(pcap_t *pcap)
@@ -162 +161 @@
-index b219873c3a..8f2cff36c3 100644
+index e9c85f2e02..3f98a7e40f 100644
@@ -165,2 +164,2 @@
-@@ -73,7 +73,7 @@ mbuf1_prepare(struct dummy_mbuf *dm, uint32_t plen)
- struct rte_udp_hdr udp;
+@@ -63,7 +63,7 @@ mbuf1_prepare(struct dummy_mbuf *dm, uint32_t plen)
+ struct rte_ipv4_hdr ip;
@@ -174,20 +173,5 @@
-diff --git a/app/test/test_security_inline_macsec.c b/app/test/test_security_inline_macsec.c
-index f11e9da8c3..c921bf8ebb 100644
---- a/app/test/test_security_inline_macsec.c
-+++ b/app/test/test_security_inline_macsec.c
-@@ -318,8 +318,8 @@ create_default_flow(const struct mcs_test_vector *td, uint16_t portid,
- struct rte_flow *flow;
- struct rte_flow_item_eth eth = { .hdr.ether_type = 0, };
- static const struct rte_flow_item_eth eth_mask = {
-- .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = RTE_BE16(0x0000),
- };
-
-diff --git a/doc/guides/prog_guide/ethdev/flow_offload.rst b/doc/guides/prog_guide/ethdev/flow_offload.rst
-index 906d6014f5..2d6187ed11 100644
---- a/doc/guides/prog_guide/ethdev/flow_offload.rst
-+++ b/doc/guides/prog_guide/ethdev/flow_offload.rst
-@@ -3865,7 +3865,7 @@ For example, to create a pattern template to match on the destination MAC:
+diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst
+index d0b7833a2f..28f60eda37 100644
+--- a/doc/guides/prog_guide/rte_flow.rst
++++ b/doc/guides/prog_guide/rte_flow.rst
+@@ -3499,7 +3499,7 @@ For example, to create a pattern template to match on the destination MAC:
@@ -203 +187 @@
-index f5787c247f..40d21e6944 100644
+index d66672a9e6..468e88a617 100644
@@ -210,5 +194,5 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0xffff,
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0xffff,
@@ -235 +219 @@
-index 62e350d736..1b55d8dd17 100644
+index df06c3862e..3aeb318049 100644
@@ -242,5 +226,5 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-- .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-+ .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
- .hdr.ether_type = RTE_BE16(0xffff),
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+- .src.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++ .src.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .type = RTE_BE16(0xffff),
@@ -267 +251 @@
-index 8ef9fd2db4..b520664d95 100644
+index 9d7247cf81..f35b0d25f7 100644
@@ -274,2 +258,2 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
@@ -283,2 +267,2 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
@@ -287,2 +271,2 @@
-- .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
+- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
@@ -293 +277 @@
-index 72fb3a55ba..031db8176b 100644
+index 6fe51f70a8..ea637ea9b0 100644
@@ -296 +280 @@
-@@ -2668,8 +2668,8 @@ mlx5_flow_validate_item_eth(const struct rte_eth_dev *dev,
+@@ -2444,8 +2444,8 @@ mlx5_flow_validate_item_eth(const struct rte_flow_item *item,
@@ -300,5 +284,5 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-- .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-+ .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
- .hdr.ether_type = RTE_BE16(0xffff),
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+- .src.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++ .src.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .type = RTE_BE16(0xffff),
@@ -307 +291 @@
-@@ -2933,12 +2933,10 @@ mlx5_flow_validate_item_ipv6(const struct rte_eth_dev *dev,
+@@ -2707,12 +2707,10 @@ mlx5_flow_validate_item_ipv6(const struct rte_flow_item *item,
@@ -324 +308 @@
-@@ -3163,7 +3161,7 @@ mlx5_flow_validate_item_vxlan(struct rte_eth_dev *dev,
+@@ -2932,7 +2930,7 @@ mlx5_flow_validate_item_vxlan(struct rte_eth_dev *dev,
@@ -328,9 +311,0 @@
-- .hdr.vni = "\xff\xff\xff",
-+ .hdr.vni = { 0xff, 0xff, 0xff },
- .hdr.rsvd1 = 0xff,
- };
- const struct rte_flow_item_vxlan *valid_mask;
-@@ -3249,7 +3247,7 @@ mlx5_flow_validate_item_vxlan_gpe(const struct rte_flow_item *item,
- } id = { .vlan_id = 0, };
-
- struct rte_flow_item_vxlan_gpe nic_mask = {
@@ -338,3 +313,2 @@
-+ .vni = { 0xff, 0xff, 0xff },
- .protocol = 0xff,
- .flags = 0xff,
++ .vni = { 0xff, 0xff, 0xff },
+ .rsvd1 = 0xff,
@@ -342 +316,2 @@
-@@ -3563,7 +3561,7 @@ mlx5_flow_validate_item_geneve(const struct rte_flow_item *item,
+ const struct rte_flow_item_vxlan *valid_mask;
+@@ -3314,7 +3312,7 @@ mlx5_flow_validate_item_geneve(const struct rte_flow_item *item,
@@ -352 +327 @@
-index 89057edbcf..8bcdb3f99e 100644
+index 7e9c22acb2..df437aba38 100644
@@ -355,18 +330,17 @@
-@@ -7697,12 +7697,10 @@ const struct rte_flow_item_ipv4 nic_ipv4_mask = {
-
- const struct rte_flow_item_ipv6 nic_ipv6_mask = {
- .hdr = {
-- .src_addr =
-- "\xff\xff\xff\xff\xff\xff\xff\xff"
-- "\xff\xff\xff\xff\xff\xff\xff\xff",
-- .dst_addr =
-- "\xff\xff\xff\xff\xff\xff\xff\xff"
-- "\xff\xff\xff\xff\xff\xff\xff\xff",
-+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
- .vtc_flow = RTE_BE32(0xffffffff),
- .proto = 0xff,
- .hop_limits = 0xff,
-@@ -9291,8 +9289,8 @@ flow_dv_translate_item_eth(void *key, const struct rte_flow_item *item,
+@@ -7082,11 +7082,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+ const struct rte_flow_item_ipv6 nic_ipv6_mask = {
+ .hdr = {
+ .src_addr =
+- "\xff\xff\xff\xff\xff\xff\xff\xff"
+- "\xff\xff\xff\xff\xff\xff\xff\xff",
++ { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .dst_addr =
+- "\xff\xff\xff\xff\xff\xff\xff\xff"
+- "\xff\xff\xff\xff\xff\xff\xff\xff",
++ { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .vtc_flow = RTE_BE32(0xffffffff),
+ .proto = 0xff,
+ .hop_limits = 0xff,
+@@ -8563,8 +8563,8 @@ flow_dv_translate_item_eth(void *key, const struct rte_flow_item *item,
@@ -376,5 +350,5 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-- .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-+ .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
- .hdr.ether_type = RTE_BE16(0xffff),
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+- .src.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++ .src.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .type = RTE_BE16(0xffff),
@@ -383 +357 @@
-@@ -9549,12 +9547,10 @@ flow_dv_translate_item_ipv6(void *key, const struct rte_flow_item *item,
+@@ -8821,12 +8821,10 @@ flow_dv_translate_item_ipv6(void *key, const struct rte_flow_item *item,
@@ -400 +374 @@
-@@ -10064,7 +10060,7 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev,
+@@ -9340,7 +9338,7 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev,
@@ -404,3 +378,3 @@
-- .hdr.vni = "\xff\xff\xff",
-+ .hdr.vni = { 0xff, 0xff, 0xff },
- .hdr.rsvd1 = 0xff,
+- .vni = "\xff\xff\xff",
++ .vni = { 0xff, 0xff, 0xff },
+ .rsvd1 = 0xff,
@@ -410 +384 @@
-index d243b59b71..96be742b94 100644
+index 42d5d6ada6..a19342a25d 100644
@@ -413 +387 @@
-@@ -377,67 +377,67 @@ static uint32_t mlx5_hw_act_flag[MLX5_HW_ACTION_FLAG_MAX]
+@@ -106,67 +106,67 @@ static uint32_t mlx5_hw_act_flag[MLX5_HW_ACTION_FLAG_MAX]
@@ -417,5 +391,5 @@
-- .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -425,5 +399,5 @@
-- .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -434,5 +408,5 @@
-- .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -442,5 +416,5 @@
-- .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -451,5 +425,5 @@
-- .hdr.dst_addr.addr_bytes = "\x01\x00\x5e\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\x01\x00\x5e\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -459,5 +433,5 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\xff\xff\xff\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -468,5 +442,5 @@
-- .hdr.dst_addr.addr_bytes = "\x33\x33\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\x33\x33\x00\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -476,5 +450,5 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\xff\xff\x00\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -485,5 +459,5 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -494,5 +468,5 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -501,18 +475 @@
-@@ -8250,12 +8250,10 @@ const struct rte_flow_item_ipv6 hws_nic_ipv6_mask = {
- .payload_len = RTE_BE16(0xffff),
- .proto = 0xff,
- .hop_limits = 0xff,
-- .src_addr =
-- "\xff\xff\xff\xff\xff\xff\xff\xff"
-- "\xff\xff\xff\xff\xff\xff\xff\xff",
-- .dst_addr =
-- "\xff\xff\xff\xff\xff\xff\xff\xff"
-- "\xff\xff\xff\xff\xff\xff\xff\xff",
-+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
- },
- .has_frag_ext = 1,
- };
-@@ -9936,8 +9934,8 @@ flow_hw_create_tx_default_mreg_copy_pattern_template(struct rte_eth_dev *dev,
+@@ -5841,8 +5841,8 @@ flow_hw_create_tx_default_mreg_copy_pattern_template(struct rte_eth_dev *dev,
@@ -522,5 +479,5 @@
-- .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -529 +486 @@
-@@ -9974,8 +9972,8 @@ flow_hw_create_lacp_rx_pattern_template(struct rte_eth_dev *dev, struct rte_flow
+@@ -5879,8 +5879,8 @@ flow_hw_create_lacp_rx_pattern_template(struct rte_eth_dev *dev, struct rte_flow
@@ -540 +497 @@
-@@ -15476,8 +15474,8 @@ mlx5_flow_hw_create_tx_default_mreg_copy_flow(struct rte_eth_dev *dev)
+@@ -9320,8 +9320,8 @@ mlx5_flow_hw_create_tx_default_mreg_copy_flow(struct rte_eth_dev *dev)
@@ -544,5 +501,5 @@
-- .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -551 +508 @@
-@@ -15815,7 +15813,7 @@ __flow_hw_ctrl_flows_unicast(struct rte_eth_dev *dev,
+@@ -9659,7 +9659,7 @@ __flow_hw_ctrl_flows_unicast(struct rte_eth_dev *dev,
@@ -560 +517 @@
-@@ -15861,7 +15859,7 @@ __flow_hw_ctrl_flows_unicast_vlan(struct rte_eth_dev *dev,
+@@ -9705,7 +9705,7 @@ __flow_hw_ctrl_flows_unicast_vlan(struct rte_eth_dev *dev,
@@ -570 +527 @@
-index a65a460731..7654f4d2ed 100644
+index 1cb0b56ae1..13152d488e 100644
@@ -573 +530 @@
-@@ -1568,23 +1568,23 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
+@@ -1562,23 +1562,23 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
@@ -577,2 +534,2 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
@@ -581,2 +538,2 @@
-- .hdr.dst_addr.addr_bytes = "\x33\x33\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
+- .dst.addr_bytes = "\x33\x33\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
@@ -585,2 +542,2 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
+- .dst.addr_bytes = "\xff\xff\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 },
@@ -589,2 +546,2 @@
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
@@ -593,2 +550,2 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
@@ -603 +560 @@
-@@ -1653,8 +1653,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
+@@ -1647,8 +1647,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
@@ -607,5 +564,5 @@
-- .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\x00\x00\x00\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -614 +571 @@
-@@ -1664,8 +1664,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
+@@ -1658,8 +1658,8 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)
@@ -618,5 +575,5 @@
-- .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = 0,
+- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
+- .src.addr_bytes = "\x00\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
++ .src.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+ .type = 0,
@@ -625,5 +582,5 @@
-diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c
-index 3023e68ae8..e94c7e22e3 100644
---- a/drivers/net/nfp/flower/nfp_flower_flow.c
-+++ b/drivers/net/nfp/flower/nfp_flower_flow.c
-@@ -2504,8 +2504,8 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {
+diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
+index 3746aa2d0f..d76bb15d91 100644
+--- a/drivers/net/nfp/nfp_flow.c
++++ b/drivers/net/nfp/nfp_flow.c
+@@ -1679,8 +1679,8 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {
@@ -631 +588 @@
- .mask_support = &(const struct rte_flow_item_eth) {
+ .mask_support = &(const struct rte_flow_item_eth){
@@ -640 +597 @@
-@@ -2557,10 +2557,10 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {
+@@ -1732,10 +1732,10 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {
@@ -655 +612 @@
-@@ -2618,7 +2618,7 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {
+@@ -1793,7 +1793,7 @@ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {
@@ -658 +615 @@
- .mask_support = &(const struct rte_flow_item_geneve) {
+ .mask_support = &(const struct rte_flow_item_geneve){
@@ -660 +617 @@
-+ .vni = { 0xff, 0xff, 0xff },
++ .vni = { 0xff, 0xff, 0xff },
@@ -664,19 +620,0 @@
-diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c
-index 5db4712193..e9f0ce3710 100644
---- a/drivers/net/nfp/nfp_net_flow.c
-+++ b/drivers/net/nfp/nfp_net_flow.c
-@@ -406,10 +406,10 @@ static const struct nfp_net_flow_item_proc nfp_net_flow_item_proc_list[] = {
- .mask_support = &(const struct rte_flow_item_ipv6){
- .hdr = {
- .proto = 0xff,
-- .src_addr = "\xff\xff\xff\xff\xff\xff\xff\xff"
-- "\xff\xff\xff\xff\xff\xff\xff\xff",
-- .dst_addr = "\xff\xff\xff\xff\xff\xff\xff\xff"
-- "\xff\xff\xff\xff\xff\xff\xff\xff",
-+ .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-+ .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
- },
- },
- .mask_default = &rte_flow_item_ipv6_mask,
@@ -684 +622 @@
-index 0a90c0487b..5ae1faf916 100644
+index 7468c3f0ea..ea23841f60 100644
@@ -687 +625 @@
-@@ -166,8 +166,8 @@ static const struct tap_flow_items tap_flow_items[] = {
+@@ -259,8 +259,8 @@ static const struct tap_flow_items tap_flow_items[] = {
@@ -691,5 +629,5 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-- .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-+ .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
- .hdr.ether_type = -1,
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+- .src.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++ .src.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+ .type = -1,
@@ -698 +636 @@
-@@ -209,14 +209,10 @@ static const struct tap_flow_items tap_flow_items[] = {
+@@ -302,14 +302,10 @@ static const struct tap_flow_items tap_flow_items[] = {
@@ -717 +655 @@
-@@ -299,7 +295,7 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
+@@ -392,7 +388,7 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
@@ -721,2 +659,2 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
@@ -726 +664 @@
-@@ -316,10 +312,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
+@@ -409,10 +405,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
@@ -730,2 +668,2 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
@@ -734,2 +672,2 @@
-- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+- .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
++ .dst.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
@@ -739 +677 @@
-@@ -336,10 +332,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
+@@ -429,10 +425,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
@@ -743,2 +681,2 @@
-- .hdr.dst_addr.addr_bytes = "\x33\x33\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
+- .dst.addr_bytes = "\x33\x33\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
@@ -747,2 +685,2 @@
-- .hdr.dst_addr.addr_bytes = "\x33\x33\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
+- .dst.addr_bytes = "\x33\x33\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x00 },
@@ -752 +690 @@
-@@ -370,10 +366,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
+@@ -463,10 +459,10 @@ static struct remote_rule implicit_rte_flows[TAP_REMOTE_MAX_IDX] = {
@@ -756,2 +694,2 @@
-- .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
+- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
@@ -760,2 +698,2 @@
-- .hdr.dst_addr.addr_bytes = "\x01\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
+- .dst.addr_bytes = "\x01\x00\x00\x00\x00\x00",
++ .dst.addr_bytes = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
@@ -765,15 +702,0 @@
-diff --git a/examples/l2fwd-macsec/main.c b/examples/l2fwd-macsec/main.c
-index b262d3ba0b..73e32fc197 100644
---- a/examples/l2fwd-macsec/main.c
-+++ b/examples/l2fwd-macsec/main.c
-@@ -512,8 +512,8 @@ create_default_flow(uint16_t portid)
- struct rte_flow *flow;
- struct rte_flow_item_eth eth;
- static const struct rte_flow_item_eth eth_mask = {
-- .hdr.dst_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-- .hdr.src_addr.addr_bytes = "\x00\x00\x00\x00\x00\x00",
-+ .hdr.dst_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-+ .hdr.src_addr.addr_bytes = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- .hdr.ether_type = RTE_BE16(0xFFFF),
- };
- int ret;
@@ -781 +704 @@
-index a2929438bf..22c5c147d0 100644
+index 706ffba596..e1aad5a98a 100644
@@ -784 +707 @@
-@@ -903,8 +903,8 @@ struct rte_flow_item_eth {
+@@ -774,8 +774,8 @@ struct rte_flow_item_eth {
@@ -795 +718 @@
-@@ -1005,12 +1005,10 @@ struct rte_flow_item_ipv6 {
+@@ -877,12 +877,10 @@ struct rte_flow_item_ipv6 {
@@ -812,10 +735 @@
-@@ -1132,7 +1130,7 @@ struct rte_flow_item_vxlan {
- /** Default mask for RTE_FLOW_ITEM_TYPE_VXLAN. */
- #ifndef __cplusplus
- static const struct rte_flow_item_vxlan rte_flow_item_vxlan_mask = {
-- .hdr.vni = "\xff\xff\xff",
-+ .hdr.vni = { 0xff, 0xff, 0xff },
- };
- #endif
-
-@@ -1185,7 +1183,7 @@ struct rte_flow_item_nvgre {
+@@ -1041,7 +1039,7 @@ struct rte_flow_item_nvgre {
@@ -830 +744 @@
-@@ -1205,7 +1203,7 @@ struct rte_flow_item_mpls {
+@@ -1061,7 +1059,7 @@ struct rte_flow_item_mpls {
@@ -839 +753 @@
-@@ -1349,7 +1347,7 @@ struct rte_flow_item_geneve {
+@@ -1196,7 +1194,7 @@ struct rte_flow_item_geneve {
@@ -848,2 +762,2 @@
-@@ -1386,7 +1384,7 @@ struct rte_flow_item_vxlan_gpe {
- */
+@@ -1216,7 +1214,7 @@ struct rte_flow_item_vxlan_gpe {
+ /** Default mask for RTE_FLOW_ITEM_TYPE_VXLAN_GPE. */
@@ -852,2 +766,2 @@
-- .hdr.vni = "\xff\xff\xff",
-+ .hdr.vni = { 0xff, 0xff, 0xff },
+- .vni = "\xff\xff\xff",
++ .vni = { 0xff, 0xff, 0xff },
@@ -857 +771 @@
-@@ -1420,9 +1418,9 @@ struct rte_flow_item_arp_eth_ipv4 {
+@@ -1241,10 +1239,10 @@ struct rte_flow_item_arp_eth_ipv4 {
@@ -861,6 +775,8 @@
-- .hdr.arp_data.arp_sha.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.arp_data.arp_sha.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
- .hdr.arp_data.arp_sip = RTE_BE32(UINT32_MAX),
-- .hdr.arp_data.arp_tha.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-+ .hdr.arp_data.arp_tha.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
- .hdr.arp_data.arp_tip = RTE_BE32(UINT32_MAX),
+- .sha.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+- .spa = RTE_BE32(0xffffffff),
+- .tha.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+- .tpa = RTE_BE32(0xffffffff),
++ .sha.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++ .spa = RTE_BE32(UINT32_MAX),
++ .tha.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++ .tpa = RTE_BE32(UINT32_MAX),
@@ -869 +785,2 @@
-@@ -1509,9 +1507,8 @@ struct rte_flow_item_icmp6_nd_ns {
+
+@@ -1320,9 +1318,8 @@ struct rte_flow_item_icmp6_nd_ns {
@@ -881 +798 @@
-@@ -1536,9 +1533,8 @@ struct rte_flow_item_icmp6_nd_na {
+@@ -1347,9 +1344,8 @@ struct rte_flow_item_icmp6_nd_na {
@@ -893 +810 @@
-@@ -1587,7 +1583,7 @@ struct rte_flow_item_icmp6_nd_opt_sla_eth {
+@@ -1398,7 +1394,7 @@ struct rte_flow_item_icmp6_nd_opt_sla_eth {
@@ -902 +819 @@
-@@ -1612,7 +1608,7 @@ struct rte_flow_item_icmp6_nd_opt_tla_eth {
+@@ -1423,7 +1419,7 @@ struct rte_flow_item_icmp6_nd_opt_tla_eth {
@@ -911,9 +827,0 @@
-@@ -2075,7 +2071,7 @@ struct rte_flow_item_ib_bth {
- static const struct rte_flow_item_ib_bth rte_flow_item_ib_bth_mask = {
- .hdr = {
- .opcode = 0xff,
-- .dst_qp = "\xff\xff\xff",
-+ .dst_qp = { 0xff, 0xff, 0xff },
- },
- };
- #endif
prev parent reply other threads:[~2025-02-17 17:09 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-17 17:03 patch 'test/ring: fix init with custom number of lcores' " luca.boccassi
2025-02-17 17:03 ` patch 'vhost: clear ring addresses when getting vring base' " luca.boccassi
2025-02-17 17:03 ` patch 'vhost: check GSO size validity' " luca.boccassi
2025-02-17 17:03 ` patch 'crypto/cnxk: fix build with GCC 15' " luca.boccassi
2025-02-17 17:03 ` patch 'net/thunderx/base: " luca.boccassi
2025-02-17 17:03 ` patch 'eal/x86: fix some intrinsics header include for Windows' " luca.boccassi
2025-02-17 17:03 ` patch 'net/bonding: fix dedicated queue setup' " luca.boccassi
2025-02-17 17:03 ` patch 'net/hns3: fix mbuf freeing in simple Tx path' " luca.boccassi
2025-02-17 17:03 ` patch 'net/hns3: remove PVID info dump for VF' " luca.boccassi
2025-02-17 17:03 ` patch 'net/hns3: rename RAS module' " luca.boccassi
2025-02-17 17:03 ` patch 'net/sfc: remove unnecessary assignment' " luca.boccassi
2025-02-17 17:03 ` patch 'net/mlx5: fix polling CQEs' " luca.boccassi
2025-02-17 17:03 ` patch 'net/iavf: remove reset of Tx prepare function pointer' " luca.boccassi
2025-02-17 17:03 ` patch 'net/ice: fix memory leak in scalar Rx' " luca.boccassi
2025-02-17 17:03 ` patch 'common/cnxk: fix atomic load in batch ops' " luca.boccassi
2025-02-17 17:03 ` patch 'common/cnxk: fix DPI mailbox structure' " luca.boccassi
2025-02-17 17:03 ` patch 'crypto/virtio: fix redundant queue free' " luca.boccassi
2025-02-17 17:03 ` patch 'crypto/openssl: fix CMAC auth context update' " luca.boccassi
2025-02-17 17:03 ` patch 'crypto/virtio: fix data queues iteration' " luca.boccassi
2025-02-17 17:03 ` patch 'net/enetfec: remove useless assignment' " luca.boccassi
2025-02-17 17:03 ` patch 'net/cnxk: fix NIX send header L3 type' " luca.boccassi
2025-02-17 17:03 ` patch 'eal/linux: fix memseg length in legacy mem init' " luca.boccassi
2025-02-17 17:03 ` patch 'use Python raw string notation' " luca.boccassi
2025-02-17 17:03 ` patch 'net/af_packet: fix socket close on device stop' " luca.boccassi
2025-02-17 17:03 ` patch 'ethdev: fix functions available in new device event' " luca.boccassi
2025-02-17 17:03 ` patch 'vhost: add null callback checks' " luca.boccassi
2025-02-17 17:04 ` patch 'build: force GCC 15 to initialize padding bits' " luca.boccassi
2025-02-17 17:04 ` patch 'net/bnxt: fix indication of allocation' " luca.boccassi
2025-02-17 17:04 ` patch 'net/bnxt: fix crash when representor is re-attached' " luca.boccassi
2025-02-17 17:04 ` patch 'net/mlx5: fix Netlink socket leak' " luca.boccassi
2025-02-17 17:04 ` patch 'net/mlx5: adjust actions per rule limitation' " luca.boccassi
2025-02-17 17:04 ` patch 'net/mlx5: fix flush of non-template flow rules' " luca.boccassi
2025-02-17 17:04 ` patch 'net/mlx5: fix GRE flow match with SWS' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix deadlock when writing i225 register' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix infinite loop' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix bitwise operation type' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: increase PHY power up delay' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: reset loop variable' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix LTR for i225' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix typo in LTR calculation' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix unused value' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix semaphore timeout " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix iterator type' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix MAC address hash bit shift' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix data type in MAC hash' " luca.boccassi
2025-02-17 17:04 ` patch 'net/igc/base: fix NVM data type in bit shift' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix semaphore timeout value' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: correct mPHY access logic' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix iterator type' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix MAC address hash bit shift' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix data type in MAC hash' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix uninitialized variable' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix bitwise operation type' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix NVM data type in bit shift' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix reset for 82580' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: fix unchecked return' " luca.boccassi
2025-02-17 17:04 ` patch 'net/e1000/base: skip management check for 82575' " luca.boccassi
2025-02-17 17:04 ` patch 'common/idpf: fix void function returning a value' " luca.boccassi
2025-02-17 17:04 ` patch 'net/intel: fix void functions " luca.boccassi
2025-02-17 17:04 ` patch 'net/intel: fix build with icx' " luca.boccassi
2025-02-17 17:04 ` patch 'net/hns3: fix copper port initialization' " luca.boccassi
2025-02-17 17:04 ` patch 'net/hns3: fix reset timeout' " luca.boccassi
2025-02-17 17:04 ` patch 'raw/cnxk_gpio: fix file descriptor leak' " luca.boccassi
2025-02-17 17:04 ` patch 'net/i40e: remove duplicate code' " luca.boccassi
2025-02-17 17:04 ` patch 'eal: fix devargs layers parsing out of bounds' " luca.boccassi
2025-02-17 17:04 ` patch 'net/qede: fix debug messages array' " luca.boccassi
2025-02-17 17:04 ` patch 'examples/ptpclient: fix message parsing' " luca.boccassi
2025-02-17 17:04 ` patch 'net/hinic: fix flow type bitmask overflow' " luca.boccassi
2025-02-17 17:04 ` patch 'crypto/dpaa2_sec: fix bitmask truncation' " luca.boccassi
2025-02-17 17:04 ` patch 'crypto/dpaa_sec: " luca.boccassi
2025-02-17 17:04 ` patch 'event/dpaa: " luca.boccassi
2025-02-17 17:04 ` patch 'net/dpaa: " luca.boccassi
2025-02-17 17:04 ` patch 'net/dpaa2: " luca.boccassi
2025-02-17 17:04 ` patch 'net/qede: fix nested loops' " luca.boccassi
2025-02-17 17:04 ` patch 'examples/l3fwd: fix socket ID check' " luca.boccassi
2025-02-17 17:04 ` patch 'common/cnxk: fix null " luca.boccassi
2025-02-17 17:04 ` patch 'eal/linux: remove useless assignments' " luca.boccassi
2025-02-17 17:04 ` patch 'mempool: fix errno in empty create' " luca.boccassi
2025-02-17 17:04 ` luca.boccassi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250217170456.1068278-79-luca.boccassi@gmail.com \
--to=luca.boccassi@gmail.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=bruce.richardson@intel.com \
--cc=dsosnowski@nvidia.com \
--cc=ferruh.yigit@amd.com \
--cc=mb@smartsharesystems.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).