From: Kevin Hao <kexin....@windriver.com>
Fixes build errors introduced by SDK commit 6906c3fbe592 ("net:
flow_dissector: Add IPSEC dissector"):
net/core/flow_dissector.c: In function ‘__skb_flow_dissect’:
net/core/flow_dissector.c:1449:40: error: passing argument 4 of
‘__skb_flow_dissect_esp’ discards ‘const’ qualifier from pointer target type
[-Werror=discarded-qualifiers]
data, nhoff, hlen);
^~~~
net/core/flow_dissector.c:163:66: note: expected ‘void *’ but argument is of
type ‘const void *’
void *target_container, void *data,
~~~~~~^~~~
net/core/flow_dissector.c:1454:39: error: passing argument 4 of
‘__skb_flow_dissect_ah’ discards ‘const’ qualifier from pointer target type
[-Werror=discarded-qualifiers]
data, nhoff, hlen);
^~~~
net/core/flow_dissector.c:141:65: note: expected ‘void *’ but argument is of
type ‘const void *’
141 | void *target_container, void *data,
| ~~~~~~^~~~
Signed-off-by: Kevin Hao <kexin....@windriver.com>
---
Hi Bruce,
Please help me merge this into the following two branches:
v5.15/standard/cn-sdkv5.4/octeon
v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
net/core/flow_dissector.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index a368491a4dbc..c8578153a2db 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -138,7 +138,7 @@ EXPORT_SYMBOL(__skb_flow_get_ports);
static void __skb_flow_dissect_ah(const struct sk_buff *skb,
struct flow_dissector *flow_dissector,
- void *target_container, void *data,
+ void *target_container, const void *data,
int nhoff, int hlen)
{
struct flow_dissector_key_ipsec *key_ah;
@@ -160,7 +160,7 @@ static void __skb_flow_dissect_ah(const struct sk_buff *skb,
static void __skb_flow_dissect_esp(const struct sk_buff *skb,
struct flow_dissector *flow_dissector,
- void *target_container, void *data,
+ void *target_container, const void *data,
int nhoff, int hlen)
{
struct flow_dissector_key_ipsec *key_esp;
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13416):
https://lists.yoctoproject.org/g/linux-yocto/message/13416
Mute This Topic: https://lists.yoctoproject.org/mt/103072138/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
