2022-11-07 19:02:21

by Felix Fietkau

[permalink] [raw]
Subject: [PATCH 09/14] flow_dissector: detect DSA using skb->protocol even when VLAN tag is present

Fixes flow dissection with ethernet devices that can combine VLAN rx hwaccel
with DSA, since skb->protocol is set to htons(ETH_P_XDSA) by the network stack.

Signed-off-by: Felix Fietkau <[email protected]>
---
net/core/flow_dissector.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 25cd35f5922e..43f6bbca7447 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -970,7 +970,7 @@ bool __skb_flow_dissect(const struct net *net,
hlen = skb_headlen(skb);
#if IS_ENABLED(CONFIG_NET_DSA)
if (unlikely(skb->dev && netdev_uses_dsa(skb->dev) &&
- proto == htons(ETH_P_XDSA))) {
+ skb->protocol == htons(ETH_P_XDSA))) {
const struct dsa_device_ops *ops;
int offset = 0;

--
2.38.1