hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ramips: Add missing andmask to ramips_esw register read for recv_good value. 

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
owl
Gabor Juhos 2012-09-05 20:08:43 +00:00
parent 04c6143ca9
commit d8b2fef763
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c
View 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); struct rt305x_esw *esw = container_of(dev, struct rt305x_esw, swdev);
int idx = val->port_vlan; int idx = val->port_vlan;
int shift = attr->id == RT305X_ESW_ATTR_PORT_RECV_GOOD ? 0 : 16; int shift = attr->id == RT305X_ESW_ATTR_PORT_RECV_GOOD ? 0 : 16;
u32 reg;
if (idx < 0 || idx >= RT305X_ESW_NUM_LANWAN) if (idx < 0 || idx >= RT305X_ESW_NUM_LANWAN)
return -EINVAL; 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; return 0;
} }