net: bcmgenet: Fix FCS generation for fragmented skbuffs
authorAdrian Cinal <adriancinal@gmail.com>
Thu, 28 Dec 2023 13:56:38 +0000 (14:56 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 3 Jan 2024 00:19:41 +0000 (16:19 -0800)
The flag DMA_TX_APPEND_CRC was only written to the first DMA descriptor
in the TX path, where each descriptor corresponds to a single skbuff
fragment (or the skbuff head). This led to packets with no FCS appearing
on the wire if the kernel allocated the packet in fragments, which would
always happen when using PACKET_MMAP/TPACKET (cf. tpacket_fill_skb() in
net/af_packet.c).

Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file")
Signed-off-by: Adrian Cinal <adriancinal1@gmail.com>
Acked-by: Doug Berger <opendmb@gmail.com>
Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20231228135638.1339245-1-adriancinal1@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/broadcom/genet/bcmgenet.c

index 9282403d1bf6612909c1cc023e783521ecf35190..2d7ae71287b14ea8a52a8fb1d90c84c6e7fc75ed 100644 (file)
@@ -2132,8 +2132,10 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
                /* Note: if we ever change from DMA_TX_APPEND_CRC below we
                 * will need to restore software padding of "runt" packets
                 */
+               len_stat |= DMA_TX_APPEND_CRC;
+
                if (!i) {
-                       len_stat |= DMA_TX_APPEND_CRC | DMA_SOP;
+                       len_stat |= DMA_SOP;
                        if (skb->ip_summed == CHECKSUM_PARTIAL)
                                len_stat |= DMA_TX_DO_CSUM;
                }