diff options
-rw-r--r-- | drivers/net/vxge/vxge-main.c | 22 | ||||
-rw-r--r-- | drivers/net/vxge/vxge-main.h | 1 |
2 files changed, 7 insertions, 16 deletions
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c index f5334b287fdb..01cdec712b64 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/drivers/net/vxge/vxge-main.c | |||
@@ -2914,26 +2914,18 @@ static int vxge_change_mtu(struct net_device *dev, int new_mtu) | |||
2914 | } | 2914 | } |
2915 | 2915 | ||
2916 | /** | 2916 | /** |
2917 | * vxge_get_stats | 2917 | * vxge_get_stats64 |
2918 | * @dev: pointer to the device structure | 2918 | * @dev: pointer to the device structure |
2919 | * @stats: pointer to struct rtnl_link_stats64 | ||
2919 | * | 2920 | * |
2920 | * Updates the device statistics structure. This function updates the device | ||
2921 | * statistics structure in the net_device structure and returns a pointer | ||
2922 | * to the same. | ||
2923 | */ | 2921 | */ |
2924 | static struct net_device_stats * | 2922 | static struct rtnl_link_stats64 * |
2925 | vxge_get_stats(struct net_device *dev) | 2923 | vxge_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *net_stats) |
2926 | { | 2924 | { |
2927 | struct vxgedev *vdev; | 2925 | struct vxgedev *vdev = netdev_priv(dev); |
2928 | struct net_device_stats *net_stats; | ||
2929 | int k; | 2926 | int k; |
2930 | 2927 | ||
2931 | vdev = netdev_priv(dev); | 2928 | /* net_stats already zeroed by caller */ |
2932 | |||
2933 | net_stats = &vdev->stats.net_stats; | ||
2934 | |||
2935 | memset(net_stats, 0, sizeof(struct net_device_stats)); | ||
2936 | |||
2937 | for (k = 0; k < vdev->no_of_vpath; k++) { | 2929 | for (k = 0; k < vdev->no_of_vpath; k++) { |
2938 | net_stats->rx_packets += vdev->vpaths[k].ring.stats.rx_frms; | 2930 | net_stats->rx_packets += vdev->vpaths[k].ring.stats.rx_frms; |
2939 | net_stats->rx_bytes += vdev->vpaths[k].ring.stats.rx_bytes; | 2931 | net_stats->rx_bytes += vdev->vpaths[k].ring.stats.rx_bytes; |
@@ -3102,7 +3094,7 @@ vxge_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) | |||
3102 | static const struct net_device_ops vxge_netdev_ops = { | 3094 | static const struct net_device_ops vxge_netdev_ops = { |
3103 | .ndo_open = vxge_open, | 3095 | .ndo_open = vxge_open, |
3104 | .ndo_stop = vxge_close, | 3096 | .ndo_stop = vxge_close, |
3105 | .ndo_get_stats = vxge_get_stats, | 3097 | .ndo_get_stats64 = vxge_get_stats64, |
3106 | .ndo_start_xmit = vxge_xmit, | 3098 | .ndo_start_xmit = vxge_xmit, |
3107 | .ndo_validate_addr = eth_validate_addr, | 3099 | .ndo_validate_addr = eth_validate_addr, |
3108 | .ndo_set_multicast_list = vxge_set_multicast, | 3100 | .ndo_set_multicast_list = vxge_set_multicast, |
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h index 2e3b064b8e4b..d4be07eaacd7 100644 --- a/drivers/net/vxge/vxge-main.h +++ b/drivers/net/vxge/vxge-main.h | |||
@@ -172,7 +172,6 @@ struct vxge_msix_entry { | |||
172 | 172 | ||
173 | struct vxge_sw_stats { | 173 | struct vxge_sw_stats { |
174 | /* Network Stats (interface stats) */ | 174 | /* Network Stats (interface stats) */ |
175 | struct net_device_stats net_stats; | ||
176 | 175 | ||
177 | /* Tx */ | 176 | /* Tx */ |
178 | u64 tx_frms; | 177 | u64 tx_frms; |