Skip to contentSkip to conversation

net: mvneta: Fix big endian issue in mvneta_txq_desc_csum()

PATCH Superseded Thomas Fitzsimmons 2 participants 2 messages Jul 8, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: mvneta: Fix big endian issue in mvneta_txq_desc_csum()

This commit fixes the command value generated for CSUM calculation when running in big endian mode. The Ethernet protocol ID for IP was being unconditionally byte-swapped in the layer 3 protocol check (with swab16), which caused the mvneta driver to not function correctly in big endian mode. This patch byte-swaps the ID conditionally with htons.

---
The mvneta driver existed prior to v3.13, but it has only supported big endian from v3.13 onward. If it's accepted, this patch needs to be backported for stable only as far back as v3.13.

 drivers/net/ethernet/marvell/mvneta.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/ethernet/marvell/mvneta.c +1 -1
index 45beca1..667cf65 100644
@@ -1207,7 +1207,7 @@ static u32 mvneta_txq_desc_csum(int l3_offs, int l3_proto,
 	command =  l3_offs    << MVNETA_TX_L3_OFF_SHIFT;
 	command |= ip_hdr_len << MVNETA_TX_IP_HLEN_SHIFT;
 
-	if (l3_proto == swab16(ETH_P_IP))
+	if (l3_proto == htons(ETH_P_IP))
 		command |= MVNETA_TXD_IP_CSUM;
 	else
 		command |= MVNETA_TX_L3_IP6;
Signature · 1 line
1.7.1
maintainer
#1 lore raw

Your postings was rejected because you did not enclose my full name in double quotes.

When a name which has special characters such as ".", as my full name does, it must be surrounded by double quotes when it appears in email headers.