renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-11 15:14:03 +08:00
Code

ixgbevf: remove private net_device_stats

Browse Source 
Use the net_device provided net_device_stats structure.

Remove ixgbevf_get_stats() now its not needed.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2010-09-08 22:48:31 +00:00 committed by David S. Miller
parent 49d61e2390
commit fb621bac21
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ixgbevf/ixgbevf.h
View File

@ -243,7 +243,6 @@ struct ixgbevf_adapter {
/* OS defined structs */ /* OS defined structs */
struct net_device *netdev; struct net_device *netdev;
struct pci_dev *pdev; struct pci_dev *pdev;
struct net_device_stats net_stats;
/* structs defined in ixgbe_vf.h */ /* structs defined in ixgbe_vf.h */
struct ixgbe_hw hw; struct ixgbe_hw hw;

26
drivers/net/ixgbevf/ixgbevf_main.c
View File

@ -308,8 +308,8 @@ static bool ixgbevf_clean_tx_irq(struct ixgbevf_adapter *adapter,
tx_ring->total_bytes += total_bytes; tx_ring->total_bytes += total_bytes;
tx_ring->total_packets += total_packets; tx_ring->total_packets += total_packets;
adapter->net_stats.tx_bytes += total_bytes; netdev->stats.tx_bytes += total_bytes;
adapter->net_stats.tx_packets += total_packets; netdev->stats.tx_packets += total_packets;
return (count < tx_ring->work_limit); return (count < tx_ring->work_limit);
} }
@ -639,8 +639,8 @@ next_desc:
rx_ring->total_packets += total_rx_packets; rx_ring->total_packets += total_rx_packets;
rx_ring->total_bytes += total_rx_bytes; rx_ring->total_bytes += total_rx_bytes;
adapter->net_stats.rx_bytes += total_rx_bytes; adapter->netdev->stats.rx_bytes += total_rx_bytes;
adapter->net_stats.rx_packets += total_rx_packets; adapter->netdev->stats.rx_packets += total_rx_packets;
return cleaned; return cleaned;
} }
@ -2297,7 +2297,7 @@ void ixgbevf_update_stats(struct ixgbevf_adapter *adapter)
adapter->stats.vfmprc); adapter->stats.vfmprc);
/* Fill out the OS statistics structure */ /* Fill out the OS statistics structure */
adapter->net_stats.multicast = adapter->stats.vfmprc - adapter->netdev->stats.multicast = adapter->stats.vfmprc -
adapter->stats.base_vfmprc; adapter->stats.base_vfmprc;
} }
@ -3180,21 +3180,6 @@ static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
/**
* ixgbevf_get_stats - Get System Network Statistics
* @netdev: network interface device structure
*
* Returns the address of the device statistics structure.
* The statistics are actually updated from the timer callback.
**/
static struct net_device_stats *ixgbevf_get_stats(struct net_device *netdev)
{
struct ixgbevf_adapter *adapter = netdev_priv(netdev);
/* only return the current stats */
return &adapter->net_stats;
}
/** /**
* ixgbevf_set_mac - Change the Ethernet Address of the NIC * ixgbevf_set_mac - Change the Ethernet Address of the NIC
* @netdev: network interface device structure * @netdev: network interface device structure
@ -3272,7 +3257,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
.ndo_open = &ixgbevf_open, .ndo_open = &ixgbevf_open,
.ndo_stop = &ixgbevf_close, .ndo_stop = &ixgbevf_close,
.ndo_start_xmit = &ixgbevf_xmit_frame, .ndo_start_xmit = &ixgbevf_xmit_frame,
.ndo_get_stats = &ixgbevf_get_stats,
.ndo_set_rx_mode = &ixgbevf_set_rx_mode, .ndo_set_rx_mode = &ixgbevf_set_rx_mode,
.ndo_set_multicast_list = &ixgbevf_set_rx_mode, .ndo_set_multicast_list = &ixgbevf_set_rx_mode,
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,