diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-07-07 17:58:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-07 17:58:56 -0400 |
commit | 28172739f0a276eb8d6ca917b3974c2edb036da3 (patch) | |
tree | b1dc00cfa20c209992e247c6f73601f609f9ca3b /drivers/usb | |
parent | 217d32dc5f299c483ca0d3c8cc6811c72c0339c4 (diff) |
net: fix 64 bit counters on 32 bit arches
There is a small possibility that a reader gets incorrect values on 32
bit arches. SNMP applications could catch incorrect counters when a
32bit high part is changed by another stats consumer/provider.
One way to solve this is to add a rtnl_link_stats64 param to all
ndo_get_stats64() methods, and also add such a parameter to
dev_get_stats().
Rule is that we are not allowed to use dev->stats64 as a temporary
storage for 64bit stats, but a caller provided area (usually on stack)
Old drivers (only providing get_stats() method) need no changes.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/rndis.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c index fb69b01c8f3a..020fa5a25fda 100644 --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c | |||
@@ -171,6 +171,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len, | |||
171 | int i, count; | 171 | int i, count; |
172 | rndis_query_cmplt_type *resp; | 172 | rndis_query_cmplt_type *resp; |
173 | struct net_device *net; | 173 | struct net_device *net; |
174 | struct rtnl_link_stats64 temp; | ||
174 | const struct rtnl_link_stats64 *stats; | 175 | const struct rtnl_link_stats64 *stats; |
175 | 176 | ||
176 | if (!r) return -ENOMEM; | 177 | if (!r) return -ENOMEM; |
@@ -194,7 +195,7 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len, | |||
194 | resp->InformationBufferOffset = cpu_to_le32 (16); | 195 | resp->InformationBufferOffset = cpu_to_le32 (16); |
195 | 196 | ||
196 | net = rndis_per_dev_params[configNr].dev; | 197 | net = rndis_per_dev_params[configNr].dev; |
197 | stats = dev_get_stats(net); | 198 | stats = dev_get_stats(net, &temp); |
198 | 199 | ||
199 | switch (OID) { | 200 | switch (OID) { |
200 | 201 | ||