ixgbevf: Removed unneeded HW struct members
Subsystems (2)
PATCH 1/1 ixgbevf: Removed unneeded HW struct members
From: Greg Rose <[email protected]>
The VF has no flash and can only do memory mapped I/O.
Signed-off-by Greg Rose <[email protected]>
Signed-off-by Jeff Kirsher <[email protected]>
---
drivers/net/ixgbevf/vf.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/ixgbevf/vf.h +0 -2
@@ -124,8 +124,6 @@ struct ixgbe_hw {void *back;u8 __iomem *hw_addr; -u8 *flash_address; -unsigned long io_base;struct ixgbe_mac_info mac;struct ixgbe_mbx_info mbx;
From: Jeff Kirsher <[email protected]>
Date: Wed, 08 Sep 2010 00:36:04 -0700
Quoted 6 lines
From: Greg Rose <[email protected]>
The VF has no flash and can only do memory mapped I/O.
Signed-off-by Greg Rose <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 1/1 ixgbevf: remove private net_device_stats
In reply to Jeff KirsherUse the net_device provided net_device_stats structure.
Remove ixgbevf_get_stats() now its not needed.
Signed-off-by Eric Dumazet <[email protected]>
--- drivers/net/ixgbevf/ixgbevf.h | 1 - drivers/net/ixgbevf/ixgbevf_main.c | 26 +++++--------------------- 2 files changed, 5 insertions(+), 22 deletions(-)
drivers/net/ixgbevf/ixgbevf.h +0 -1
@@ -243,7 +243,6 @@ struct ixgbevf_adapter {/* OS defined structs */ struct net_device *netdev;struct pci_dev *pdev; -struct net_device_stats net_stats;/* structs defined in ixgbe_vf.h */ struct ixgbe_hw hw;
drivers/net/ixgbevf/ixgbevf_main.c +5 -21
@@ -308,8 +308,8 @@ static bool ixgbevf_clean_tx_irq(struct ixgbevf_adapter *adapter, tx_ring->total_bytes += total_bytes; tx_ring->total_packets += total_packets; - adapter->net_stats.tx_bytes += total_bytes; - adapter->net_stats.tx_packets += total_packets; + netdev->stats.tx_bytes += total_bytes; + netdev->stats.tx_packets += total_packets;return (count < tx_ring->work_limit); }
@@ -639,8 +639,8 @@ next_desc: rx_ring->total_packets += total_rx_packets; rx_ring->total_bytes += total_rx_bytes; - adapter->net_stats.rx_bytes += total_rx_bytes; - adapter->net_stats.rx_packets += total_rx_packets; + adapter->netdev->stats.rx_bytes += total_rx_bytes; + adapter->netdev->stats.rx_packets += total_rx_packets;return cleaned; }
@@ -2297,7 +2297,7 @@ void ixgbevf_update_stats(struct ixgbevf_adapter *adapter) adapter->stats.vfmprc);/* Fill out the OS statistics structure */ - adapter->net_stats.multicast = adapter->stats.vfmprc - + adapter->netdev->stats.multicast = adapter->stats.vfmprc - adapter->stats.base_vfmprc; }
@@ -3181,21 +3181,6 @@ static int ixgbevf_xmit_frame(struct sk_buff *skb, struct net_device *netdev) }/** -* 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 * @netdev: network interface device structure * @p: pointer to an address structure
@@ -3272,7 +3257,6 @@ static const struct net_device_ops ixgbe_netdev_ops = { .ndo_open = &ixgbevf_open, .ndo_stop = &ixgbevf_close, .ndo_start_xmit = &ixgbevf_xmit_frame, - .ndo_get_stats = &ixgbevf_get_stats, .ndo_set_rx_mode = &ixgbevf_set_rx_mode, .ndo_set_multicast_list = &ixgbevf_set_rx_mode, .ndo_validate_addr = eth_validate_addr,