Commit 0a198587 authored by Thomas Fitzsimmons's avatar Thomas Fitzsimmons Committed by David S. Miller

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.

Cc: <stable@vger.kernel.org> # v3.13+
Signed-off-by: default avatarThomas Fitzsimmons <fitzsim@fitzsim.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d12bc63
...@@ -1207,7 +1207,7 @@ static u32 mvneta_txq_desc_csum(int l3_offs, int l3_proto, ...@@ -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 = l3_offs << MVNETA_TX_L3_OFF_SHIFT;
command |= ip_hdr_len << MVNETA_TX_IP_HLEN_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; command |= MVNETA_TXD_IP_CSUM;
else else
command |= MVNETA_TX_L3_IP6; command |= MVNETA_TX_L3_IP6;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment