Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 255464
b: refs/heads/master
c: f20530b
h: refs/heads/master
v: v3
  • Loading branch information
stephen hemminger authored and David S. Miller committed Jun 9, 2011
1 parent c7d7adc commit a932407
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 47fd428cd051072cf3666aaef5065f7d5746ab2c
refs/heads/master: f20530bc982d67ebde84b3e0a043549d7ccd85a1
8 changes: 4 additions & 4 deletions trunk/drivers/net/enic/enic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -801,10 +801,10 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
}

/* dev_base_lock rwlock held, nominally process context */
static struct net_device_stats *enic_get_stats(struct net_device *netdev)
static struct rtnl_link_stats64 *enic_get_stats(struct net_device *netdev,
struct rtnl_link_stats64 *net_stats)
{
struct enic *enic = netdev_priv(netdev);
struct net_device_stats *net_stats = &netdev->stats;
struct vnic_stats *stats;

enic_dev_stats_dump(enic, &stats);
Expand Down Expand Up @@ -2117,7 +2117,7 @@ static const struct net_device_ops enic_netdev_dynamic_ops = {
.ndo_open = enic_open,
.ndo_stop = enic_stop,
.ndo_start_xmit = enic_hard_start_xmit,
.ndo_get_stats = enic_get_stats,
.ndo_get_stats64 = enic_get_stats,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_rx_mode = enic_set_rx_mode,
.ndo_set_multicast_list = enic_set_rx_mode,
Expand All @@ -2139,7 +2139,7 @@ static const struct net_device_ops enic_netdev_ops = {
.ndo_open = enic_open,
.ndo_stop = enic_stop,
.ndo_start_xmit = enic_hard_start_xmit,
.ndo_get_stats = enic_get_stats,
.ndo_get_stats64 = enic_get_stats,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = enic_set_mac_address,
.ndo_set_rx_mode = enic_set_rx_mode,
Expand Down

0 comments on commit a932407

Please sign in to comment.