projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cf6b5fb
)
net: bcmgenet: device stats are unsigned long
author
Eric Dumazet
<
[email protected]
>
Fri, 15 Apr 2016 17:47:52 +0000
(10:47 -0700)
committer
David S. Miller
<
[email protected]
>
Sun, 17 Apr 2016 02:03:39 +0000
(22:03 -0400)
On 64bit kernels, device stats are 64bit wide, not 32bit.
Fixes: 1c1008c793fa4 ("net: bcmgenet: add main driver file")
Signed-off-by: Eric Dumazet <
[email protected]
>
Cc: Florian Fainelli <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/broadcom/genet/bcmgenet.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index cf6445d148ca5098c5ed4a7ab443022fe212ae27..44ad1490b4726175ea8f5697b3a759e5cc7befcb 100644
(file)
--- a/
drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/
drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@
-878,7
+878,11
@@
static void bcmgenet_get_ethtool_stats(struct net_device *dev,
else
p = (char *)priv;
p += s->stat_offset;
- data[i] = *(u32 *)p;
+ if (sizeof(unsigned long) != sizeof(u32) &&
+ s->stat_sizeof == sizeof(unsigned long))
+ data[i] = *(unsigned long *)p;
+ else
+ data[i] = *(u32 *)p;
}
}