ramips: Add missing andmask to ramips_esw register read for recv_good value.
authorGabor Juhos <juhosg@openwrt.org>
Wed, 5 Sep 2012 20:08:43 +0000 (20:08 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Wed, 5 Sep 2012 20:08:43 +0000 (20:08 +0000)
Add missing andmask to ramips_esw register read for recv_good value.

Without the mask, recv_bad leaks into the recv_good packet count.
Didn't notice the bug before since you don't usually get bad
packets, so I only saw it when I was playing with overlength packets
earlier...

Signed-off-by: Tobias Diedrich <ranma+openwrt@tdiedrich.de>
SVN-Revision: 33322

target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c

index f01baa1..798eb74 100644 (file)
@@ -750,11 +750,13 @@ rt305x_esw_get_port_recv_badgood(struct switch_dev *dev,
        struct rt305x_esw *esw = container_of(dev, struct rt305x_esw, swdev);
        int idx = val->port_vlan;
        int shift = attr->id == RT305X_ESW_ATTR_PORT_RECV_GOOD ? 0 : 16;
+       u32 reg;
 
        if (idx < 0 || idx >= RT305X_ESW_NUM_LANWAN)
                return -EINVAL;
 
-       val->value.i = rt305x_esw_rr(esw, RT305X_ESW_REG_P0PC + 4*idx) >> shift;
+       reg = rt305x_esw_rr(esw, RT305X_ESW_REG_P0PC + 4*idx);
+       val->value.i = (reg >> shift) & 0xffff;
 
        return 0;
 }