diff options
| author | Max.Nekludov@us.elster.com <Max.Nekludov@us.elster.com> | 2013-03-29 05:27:36 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-05 10:16:54 -0700 |
| commit | 3d2479580b8832251ab98dff289a88647e2d73bf (patch) | |
| tree | 3b502967d21650097fab1ea7d72d23d6e930a56d | |
| parent | 79f0840fe9b4b304df53d24034744b6759352e17 (diff) | |
| download | kernel_goldelico_gta04-3d2479580b8832251ab98dff289a88647e2d73bf.zip kernel_goldelico_gta04-3d2479580b8832251ab98dff289a88647e2d73bf.tar.gz kernel_goldelico_gta04-3d2479580b8832251ab98dff289a88647e2d73bf.tar.bz2 | |
ks8851: Fix interpretation of rxlen field.
[ Upstream commit 14bc435ea54cb888409efb54fc6b76c13ef530e9 ]
According to the Datasheet (page 52):
15-12 Reserved
11-0 RXBC Receive Byte Count
This field indicates the present received frame byte size.
The code has a bug:
rxh = ks8851_rdreg32(ks, KS_RXFHSR);
rxstat = rxh & 0xffff;
rxlen = rxh >> 16; // BUG!!! 0xFFF mask should be applied
Signed-off-by: Max Nekludov <Max.Nekludov@us.elster.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ks8851.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c index bcd9ba6..99593f0 100644 --- a/drivers/net/ks8851.c +++ b/drivers/net/ks8851.c @@ -489,7 +489,7 @@ static void ks8851_rx_pkts(struct ks8851_net *ks) for (; rxfc != 0; rxfc--) { rxh = ks8851_rdreg32(ks, KS_RXFHSR); rxstat = rxh & 0xffff; - rxlen = rxh >> 16; + rxlen = (rxh >> 16) & 0xfff; netif_dbg(ks, rx_status, ks->netdev, "rx: stat 0x%04x, len 0x%04x\n", rxstat, rxlen); |