| Submitter | Eric Dumazet |
|---|---|
| Date | March 7, 2012, 5:46 a.m. |
| Message ID | <1331099201.2474.59.camel@edumazet-laptop> |
| Download | mbox | patch |
| Permalink | /patch/145158/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
On Tue, Mar 06, 2012 at 09:46:41PM -0800, Eric Dumazet wrote: > 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 <eric.dumazet@gmail.com> > Cc: Anton Blanchard <anton@samba.org> > Cc: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> > --- > 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) > > Tested, in particular, the multicast stat, pinging 224.0.0.1 from another machine. Thanks. Cascardo. Acked-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> Tested-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 <cascardo@linux.vnet.ibm.com> > Tested-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> > 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) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Wed, 07 Mar 2012 06:44:51 -0800 > 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 <cascardo@linux.vnet.ibm.com> >> Tested-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> >> > > 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'. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
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)
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 <eric.dumazet@gmail.com> Cc: Anton Blanchard <anton@samba.org> Cc: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> --- drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html