| Message ID | 1278555085-17074-1-git-send-email-dm@chelsio.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Le mercredi 07 juillet 2010 à 19:11 -0700, Dimitris Michailidis a écrit : > The change to ndo_get_stats64 in "net: fix 64 bit counters on 32 bit arches" > missed cxgb4. Fix it. > > Signed-off-by: Dimitris Michailidis <dm@chelsio.com> > --- Indeed, sorry and thanks ! Acked-by: Eric Dumazet <eric.dumazet@gmail.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
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Thu, 08 Jul 2010 07:17:10 +0200 > Le mercredi 07 juillet 2010 à 19:11 -0700, Dimitris Michailidis a > écrit : >> The change to ndo_get_stats64 in "net: fix 64 bit counters on 32 bit arches" >> missed cxgb4. Fix it. >> >> Signed-off-by: Dimitris Michailidis <dm@chelsio.com> >> --- > > Indeed, sorry and thanks ! > > Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Applied, thanks. -- 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
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c index 55a720e..2619997 100644 --- a/drivers/net/cxgb4/cxgb4_main.c +++ b/drivers/net/cxgb4/cxgb4_main.c @@ -2601,12 +2601,12 @@ static int cxgb_close(struct net_device *dev) return t4_enable_vi(adapter, 0, pi->viid, false, false); } -static struct rtnl_link_stats64 *cxgb_get_stats(struct net_device *dev) +static struct rtnl_link_stats64 *cxgb_get_stats(struct net_device *dev, + struct rtnl_link_stats64 *ns) { struct port_stats stats; struct port_info *p = netdev_priv(dev); struct adapter *adapter = p->adapter; - struct rtnl_link_stats64 *ns = &dev->stats64; spin_lock(&adapter->stats_lock); t4_get_port_stats(adapter, p->tx_chan, &stats);
The change to ndo_get_stats64 in "net: fix 64 bit counters on 32 bit arches" missed cxgb4. Fix it. Signed-off-by: Dimitris Michailidis <dm@chelsio.com> --- drivers/net/cxgb4/cxgb4_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)