Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202911
b: refs/heads/master
c: 4472702
h: refs/heads/master
i:
  202909: 193c707
  202907: dc39343
  202903: c90f17c
  202895: efbe555
  202879: ad9a131
v: v3
  • Loading branch information
Ben Hutchings authored and David S. Miller committed Jun 12, 2010
1 parent 0bbd40e commit f5c3e35
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: be1f3c2c027cc5ad735df6a45a542ed1db7ec48b
refs/heads/master: 4472702e6575809c2d232efc09ac25caf66b395d
6 changes: 3 additions & 3 deletions trunk/drivers/net/sfc/efx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit f5c3e35

Please sign in to comment.