* [PATCH net] net: bcmsysport: Device stats are unsigned long
@ 2016-06-30 17:56 Florian Fainelli
2016-06-30 18:33 ` Andrew Lunn
0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2016-06-30 17:56 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, Florian Fainelli
On 64bits kernels, device stats are 64bits wide, not 32bits.
Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/broadcom/bcmsysport.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 543bf38105c9..21f21e23e695 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -392,7 +392,11 @@ static void bcm_sysport_get_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;
}
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] net: bcmsysport: Device stats are unsigned long
2016-06-30 17:56 [PATCH net] net: bcmsysport: Device stats are unsigned long Florian Fainelli
@ 2016-06-30 18:33 ` Andrew Lunn
2016-06-30 19:58 ` Florian Fainelli
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Lunn @ 2016-06-30 18:33 UTC (permalink / raw)
To: Florian Fainelli; +Cc: netdev, davem, edumazet
On Thu, Jun 30, 2016 at 10:56:29AM -0700, Florian Fainelli wrote:
> On 64bits kernels, device stats are 64bits wide, not 32bits.
>
> Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> drivers/net/ethernet/broadcom/bcmsysport.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
> index 543bf38105c9..21f21e23e695 100644
> --- a/drivers/net/ethernet/broadcom/bcmsysport.c
> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
> @@ -392,7 +392,11 @@ static void bcm_sysport_get_stats(struct net_device *dev,
> else
> p = (char *)priv;
> p += s->stat_offset;
> - data[i] = *(u32 *)p;
Hi Florian
Could you not just change this cast from u32 to unsigned long and be
done?
160 struct net_device_stats {
161 unsigned long rx_packets;
162 unsigned long tx_packets;
Andrew
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] net: bcmsysport: Device stats are unsigned long
2016-06-30 18:33 ` Andrew Lunn
@ 2016-06-30 19:58 ` Florian Fainelli
0 siblings, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2016-06-30 19:58 UTC (permalink / raw)
To: Andrew Lunn; +Cc: netdev, davem, edumazet
On 06/30/2016 11:33 AM, Andrew Lunn wrote:
> On Thu, Jun 30, 2016 at 10:56:29AM -0700, Florian Fainelli wrote:
>> On 64bits kernels, device stats are 64bits wide, not 32bits.
>>
>> Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>> ---
>> drivers/net/ethernet/broadcom/bcmsysport.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
>> index 543bf38105c9..21f21e23e695 100644
>> --- a/drivers/net/ethernet/broadcom/bcmsysport.c
>> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
>> @@ -392,7 +392,11 @@ static void bcm_sysport_get_stats(struct net_device *dev,
>> else
>> p = (char *)priv;
>> p += s->stat_offset;
>> - data[i] = *(u32 *)p;
>
> Hi Florian
>
> Could you not just change this cast from u32 to unsigned long and be
> done?
Seems like this would work yes, even with our mixture of u32 stats read
from HW and the software netdev stats, thanks!
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-30 19:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-30 17:56 [PATCH net] net: bcmsysport: Device stats are unsigned long Florian Fainelli
2016-06-30 18:33 ` Andrew Lunn
2016-06-30 19:58 ` Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).