diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-14 18:37:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-14 18:37:05 -0700 |
| commit | 0d1d392f011b284bb4af0411b2d36e5d04e0f058 (patch) | |
| tree | 081f99182bde3cc8af49b80b4e9df7d95476e8ed /drivers/net/ethernet/micrel/ks8851.c | |
| parent | PM / Runtime: Idle devices asynchronously after probe|release (diff) | |
| parent | Linux 3.9-rc7 (diff) | |
| download | linux-dev-0d1d392f011b284bb4af0411b2d36e5d04e0f058.tar.xz linux-dev-0d1d392f011b284bb4af0411b2d36e5d04e0f058.zip | |
Merge 3.9-rc7 into driver-core-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/micrel/ks8851.c')
| -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 33bcb63d56a2..8fb481252e2c 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -528,7 +528,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); |