From 8b0610c646de82cadce397d1f34c9b4b2406c060 Mon Sep 17 00:00:00 2001 From: "Max.Nekludov@us.elster.com" Date: Fri, 29 Mar 2013 05:27:36 +0000 Subject: [PATCH] --- yaml --- r: 362069 b: refs/heads/master c: 14bc435ea54cb888409efb54fc6b76c13ef530e9 h: refs/heads/master i: 362067: 1b1ce1358e87de6d71f3418a6fd0cee0bb8dcf9b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/micrel/ks8851.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8582e61748ef..a80606299e3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00cfec37484761a44a3b6f4675a54caa618210ae +refs/heads/master: 14bc435ea54cb888409efb54fc6b76c13ef530e9 diff --git a/trunk/drivers/net/ethernet/micrel/ks8851.c b/trunk/drivers/net/ethernet/micrel/ks8851.c index 33bcb63d56a2..8fb481252e2c 100644 --- a/trunk/drivers/net/ethernet/micrel/ks8851.c +++ b/trunk/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);