[PATCH] ehea: restore multicast and rx_errors fields

Commit 239c562c94d (ehea: Add 64bit statistics) added a regression,
since we no longer report multicast & rx_errors fields, taken from
port->stats structure. These fields are updated in ehea_update_stats()
every second.

Signed-off-by: Eric Dumazet <redacted>
Cc: Anton Blanchard <redacted>
Cc: Thadeu Lima de Souza Cascardo <redacted>
---
 drivers/net/ethernet/ibm/ehea/ehea_main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 5d5fb26..e6893cd 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c

@@ -336,7 +336,9 @@ static struct rtnl_link_stats64 *ehea_get_stats64(struct net_device *dev,
 	stats->tx_bytes = tx_bytes;
 	stats->rx_packets = rx_packets;
 
-	return &port->stats;
+	stats->multicast = port->stats.multicast;
+	stats->rx_errors = port->stats.rx_errors;
+	return stats;
 }
 
 static void ehea_update_stats(struct work_struct *work)

On Tue, Mar 06, 2012 at 09:46:41PM -0800, Eric Dumazet wrote:

Tested, in particular, the multicast stat, pinging 224.0.0.1 from
another machine.

Thanks.
Cascardo.

Acked-by: Thadeu Lima de Souza Cascardo <redacted>
Tested-by: Thadeu Lima de Souza Cascardo <redacted>

Le mercredi 07 mars 2012 à 11:17 -0300, Thadeu Lima de Souza Cascardo a
écrit :

Tested, in particular, the multicast stat, pinging 224.0.0.1 from
another machine.

Thanks.
Cascardo.

Acked-by: Thadeu Lima de Souza Cascardo <redacted>
Tested-by: Thadeu Lima de Souza Cascardo <redacted>

Thanks !

Maybe you could submit a followup patch, to remove the port->stats
structure and only use two u64 fields, since this driver only use two
counters in its private "stats" ?

(I cant compile this driver on my dev machine)

From: Eric Dumazet <redacted>
Date: Wed, 07 Mar 2012 06:44:51 -0800

Le mercredi 07 mars 2012 à 11:17 -0300, Thadeu Lima de Souza Cascardo a
écrit :

quoted

Tested, in particular, the multicast stat, pinging 224.0.0.1 from
another machine.

Thanks.
Cascardo.

Acked-by: Thadeu Lima de Souza Cascardo <redacted>
Tested-by: Thadeu Lima de Souza Cascardo <redacted>

Thanks !

Maybe you could submit a followup patch, to remove the port->stats
structure and only use two u64 fields, since this driver only use two
counters in its private "stats" ?

Yes that sounds like a good idea.

I've applied Eric's patch to 'net'.