From f5c3e357094354b0fd6f81511ebdb2473de1e6c5 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 8 Jun 2010 07:21:12 +0000 Subject: [PATCH] --- yaml --- r: 202911 b: refs/heads/master c: 4472702e6575809c2d232efc09ac25caf66b395d h: refs/heads/master i: 202909: 193c707a7256ecf2644c722323060c06ed7e302c 202907: dc393438d02c8306643c8d741cf5d298d9927465 202903: c90f17cc7e057f711e7a75efafcbfecd7fdfbd1a 202895: efbe555b2c97fef09b4a39b351b212fed00fc866 202879: ad9a13128f802d5af3852cb6111f072375ae525c v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/efx.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fad60cb7c20c..146c5a40fe4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be1f3c2c027cc5ad735df6a45a542ed1db7ec48b +refs/heads/master: 4472702e6575809c2d232efc09ac25caf66b395d diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c index 26b0cc219204..8ad476a19d95 100644 --- a/trunk/drivers/net/sfc/efx.c +++ b/trunk/drivers/net/sfc/efx.c @@ -1492,11 +1492,11 @@ static int efx_net_stop(struct net_device *net_dev) } /* Context: process, dev_base_lock or RTNL held, non-blocking. */ -static struct net_device_stats *efx_net_stats(struct net_device *net_dev) +static struct rtnl_link_stats64 *efx_net_stats(struct net_device *net_dev) { struct efx_nic *efx = netdev_priv(net_dev); struct efx_mac_stats *mac_stats = &efx->mac_stats; - struct net_device_stats *stats = &net_dev->stats; + struct rtnl_link_stats64 *stats = &net_dev->stats64; spin_lock_bh(&efx->stats_lock); efx->type->update_stats(efx); @@ -1630,7 +1630,7 @@ static void efx_set_multicast_list(struct net_device *net_dev) static const struct net_device_ops efx_netdev_ops = { .ndo_open = efx_net_open, .ndo_stop = efx_net_stop, - .ndo_get_stats = efx_net_stats, + .ndo_get_stats64 = efx_net_stats, .ndo_tx_timeout = efx_watchdog, .ndo_start_xmit = efx_hard_start_xmit, .ndo_validate_addr = eth_validate_addr,