realtek: fix RTL839x receive tag decoding
authorBjørn Mork <bjorn@mork.no>
Fri, 9 Sep 2022 06:28:13 +0000 (08:28 +0200)
committerSander Vanheule <sander@svanheule.net>
Fri, 9 Sep 2022 20:11:55 +0000 (22:11 +0200)
The previous fixup was incomplete, and the offsets for the
queue and crc_error cpu_tag bitfields were still wrong on
RTL839x.

Fixes: 545c6113c93b ("realtek: fix RTL838x receive tag decoding")
Suggested-by: Jan Hoffmann <jan@3e8.eu>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
target/linux/realtek/files-5.10/drivers/net/ethernet/rtl838x_eth.c

index d9ade6552698a6fd84344abc7fd3aa9b28a84ec9..e96c5a7216f8344cb047087f931fcc06f92ab02e 100644 (file)
@@ -282,9 +282,9 @@ bool rtl839x_decode_tag(struct p_hdr *h, struct dsa_tag *t)
 {
        /* cpu_tag[0] is reserved. Fields are off-by-one */
        t->reason = h->cpu_tag[5] & 0x1f;
-       t->queue = (h->cpu_tag[3] & 0xe000) >> 13;
+       t->queue = (h->cpu_tag[4] & 0xe000) >> 13;
        t->port = h->cpu_tag[1] & 0x3f;
-       t->crc_error = h->cpu_tag[3] & BIT(2);
+       t->crc_error = h->cpu_tag[4] & BIT(6);
 
        pr_debug("Reason: %d\n", t->reason);
        if ((t->reason >= 7 && t->reason <= 13) || // NIC_RX_REASON_RMA