From 8f17955c03c139ca8a1b728d86d7b36a992941a8 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 24 May 2012 22:41:40 +0300 Subject: [PATCH] [epic100] Fix wrong field used as rx packet length Datasheet pp. 41-42 defines 'rx packet length' as upper word of 'status' dword field of the receive descriptor table. http://www.smsc.com/media/Downloads_Archive/discontinued/83c171.pdf Tested on SMC EtherPower II. Signed-off-by: Alexey Smazhenko Signed-off-by: Michael Brown --- src/drivers/net/epic100.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c index b478fab5..884eb722 100644 --- a/src/drivers/net/epic100.c +++ b/src/drivers/net/epic100.c @@ -376,7 +376,7 @@ epic100_poll(struct nic *nic, int retrieve) { int entry; int retcode; - int status; + unsigned long status; entry = cur_rx % RX_RING_SIZE; if ((rx_ring[entry].status & cpu_to_le32(RRING_OWN)) == RRING_OWN) @@ -401,7 +401,7 @@ epic100_poll(struct nic *nic, int retrieve) retcode = 0; } else { /* Omit the four octet CRC from the length. */ - nic->packetlen = le32_to_cpu((rx_ring[entry].buflength))- 4; + nic->packetlen = (status >> 16) - 4; memcpy(nic->packet, &rx_packet[entry * PKT_BUF_SZ], nic->packetlen); retcode = 1; }