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:04:41 -0700 |
commit | 5afd933cc476e33339eeca8928de1357857657ea (patch) | |
tree | 4ccacdd6cafb4f0cd3b33488467cdbc3b55790c3 /drivers/net | |
parent | 567a4ac4b7d48e186a28168e40388503d5b7eb01 (diff) | |
download | linux-3.10-5afd933cc476e33339eeca8928de1357857657ea.tar.gz linux-3.10-5afd933cc476e33339eeca8928de1357857657ea.tar.bz2 linux-3.10-5afd933cc476e33339eeca8928de1357857657ea.zip |
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/micrel/ks8851.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c index 5e313e9a252..2a417c33b16 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -547,7 +547,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); |