Commit 73eac064 authored by Al Viro's avatar Al Viro Committed by Jeff Garzik
Browse files

typhoon: endianness bug in tx/rx byte counters 



txBytes and rxBytesGood are both 64bit; using le32_to_cpu() won't work
on big-endian for obvious reasons.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 5b825ed2

drivers/net/typhoon.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -977,12 +977,12 @@ typhoon_do_get_stats(struct typhoon *tp) 
	 * ethtool_ops->get_{strings,stats}()

	 * ethtool_ops->get_{strings,stats}()

	 */

	 */

	stats->tx_packets = le32_to_cpu(s->txPackets);

	stats->tx_packets = le32_to_cpu(s->txPackets);

	stats->tx_bytes = le32_to_cpu(s->txBytes);

	stats->tx_bytes = le64_to_cpu(s->txBytes);

	stats->tx_errors = le32_to_cpu(s->txCarrierLost);

	stats->tx_errors = le32_to_cpu(s->txCarrierLost);

	stats->tx_carrier_errors = le32_to_cpu(s->txCarrierLost);

	stats->tx_carrier_errors = le32_to_cpu(s->txCarrierLost);

	stats->collisions = le32_to_cpu(s->txMultipleCollisions);

	stats->collisions = le32_to_cpu(s->txMultipleCollisions);

	stats->rx_packets = le32_to_cpu(s->rxPacketsGood);

	stats->rx_packets = le32_to_cpu(s->rxPacketsGood);

	stats->rx_bytes = le32_to_cpu(s->rxBytesGood);

	stats->rx_bytes = le64_to_cpu(s->rxBytesGood);

	stats->rx_fifo_errors = le32_to_cpu(s->rxFifoOverruns);

	stats->rx_fifo_errors = le32_to_cpu(s->rxFifoOverruns);

	stats->rx_errors = le32_to_cpu(s->rxFifoOverruns) +

	stats->rx_errors = le32_to_cpu(s->rxFifoOverruns) +

			le32_to_cpu(s->BadSSD) + le32_to_cpu(s->rxCrcErrors);

			le32_to_cpu(s->BadSSD) + le32_to_cpu(s->rxCrcErrors);