Skip to content

Commit 1dcf6ef

Browse files
vladimirolteandavem330
authored andcommitted
net: dsa: tag_sja1105: fix MAC DA patching from meta frames
The SJA1105 manual says that at offset 4 into the meta frame payload we have "MAC destination byte 2" and at offset 5 we have "MAC destination byte 1". These are counted from the LSB, so byte 1 is h_dest[ETH_HLEN-2] aka h_dest[4] and byte 2 is h_dest[ETH_HLEN-3] aka h_dest[3]. The sja1105_meta_unpack() function decodes these the other way around, so a frame with MAC DA 01:80:c2:11:22:33 is received by the network stack as having 01:80:c2:22:11:33. Fixes: e53e18a ("net: dsa: sja1105: Receive and decode meta frames") Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Simon Horman <simon.horman@corigine.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent ba7bdec commit 1dcf6ef

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/dsa/tag_sja1105.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ static void sja1105_meta_unpack(const struct sk_buff *skb,
118118
* a unified unpacking command for both device series.
119119
*/
120120
packing(buf, &meta->tstamp, 31, 0, 4, UNPACK, 0);
121-
packing(buf + 4, &meta->dmac_byte_4, 7, 0, 1, UNPACK, 0);
122-
packing(buf + 5, &meta->dmac_byte_3, 7, 0, 1, UNPACK, 0);
121+
packing(buf + 4, &meta->dmac_byte_3, 7, 0, 1, UNPACK, 0);
122+
packing(buf + 5, &meta->dmac_byte_4, 7, 0, 1, UNPACK, 0);
123123
packing(buf + 6, &meta->source_port, 7, 0, 1, UNPACK, 0);
124124
packing(buf + 7, &meta->switch_id, 7, 0, 1, UNPACK, 0);
125125
}

0 commit comments

Comments
 (0)