This is a note to let you know that I've just added the patch titled
dsa: tag_dsa: Fix mask for trunked packets
to the 5.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
dsa-tag_dsa-fix-mask-for-trunked-packets.patch
and it can be found in the queue-5.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b44d52a50bc6f191f0ae03f65de8401f3ef039b3 Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@xxxxxxx>
Date: Sun, 3 Oct 2021 17:50:53 +0200
Subject: dsa: tag_dsa: Fix mask for trunked packets
From: Andrew Lunn <andrew@xxxxxxx>
commit b44d52a50bc6f191f0ae03f65de8401f3ef039b3 upstream.
A packet received on a trunk will have bit 2 set in Forward DSA tagged
frame. Bit 1 can be either 0 or 1 and is otherwise undefined and bit 0
indicates the frame CFI. Masking with 7 thus results in frames as
being identified as being from a trunk when in fact they are not. Fix
the mask to just look at bit 2.
Fixes: 5b60dadb71db ("net: dsa: tag_dsa: Support reception of packets from LAG devices")
Signed-off-by: Andrew Lunn <andrew@xxxxxxx>
Reviewed-by: Vladimir Oltean <vladimir.oltean@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/dsa/tag_dsa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -176,7 +176,7 @@ static struct sk_buff *dsa_rcv_ll(struct
case DSA_CMD_FORWARD:
skb->offload_fwd_mark = 1;
- trunk = !!(dsa_header[1] & 7);
+ trunk = !!(dsa_header[1] & 4);
break;
case DSA_CMD_TO_CPU:
Patches currently in stable-queue which might be from andrew@xxxxxxx are
queue-5.14/arm-dts-imx6qdl-pico-fix-ethernet-support.patch
queue-5.14/dsa-tag_dsa-fix-mask-for-trunked-packets.patch
queue-5.14/net-sfp-fix-typo-in-state-machine-debug-string.patch
