Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9421c901 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by David S. Miller
Browse files

net: ethernet: ti: cpsw: fix min eth packet size 



Now CPSW driver configures min eth packet size to 60 octets (ETH_ZLEN)
which works in most of cases, but when port VLAN is configured on some
switch port, it also can be configured to force all egress packets to be
VLAN untagged. And in this case, CPSW driver will pad small packets to 60
octets, but final packet size on port egress can became less than 60 octets
due to VLAN tag removal and packet will be dropped.

Hence, fix it by accounting VLAN header in CPSW min eth packet size. While
here, use proper defines for CPSW_MAX_PACKET_SIZE also, instead of open
coding.

Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ab6a0dd

drivers/net/ethernet/ti/cpsw.c

+2 −2
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ do { \ 
#define CPDMA_RXCP		0x60



#define CPSW_POLL_WEIGHT	64

#define CPSW_MIN_PACKET_SIZE	60

#define CPSW_MAX_PACKET_SIZE	(1500 + 14 + 4 + 4)

#define CPSW_MIN_PACKET_SIZE	(VLAN_ETH_ZLEN)

#define CPSW_MAX_PACKET_SIZE	(VLAN_ETH_FRAME_LEN + ETH_FCS_LEN)



#define RX_PRIORITY_MAPPING	0x76543210

#define TX_PRIORITY_MAPPING	0x33221100