aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/netdev.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2013-02-19 23:06:11 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-03-08 04:01:55 -0500
commitfc830b785b08cd8c6974850f78fa9cf221c311a8 (patch)
treef71cb8597e6adede6e303c5e607fd89f93c6f6b3 /drivers/net/ethernet/intel/e1000e/netdev.c
parent53aa82da090222a0eec2956cf9d8409326adca40 (diff)
e1000e: cleanup (add/remove) blank lines where appropriate
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index ca1c10e5f69b..172d2e32af32 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1542,7 +1542,6 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
1542 rx_ring->rx_skb_top = NULL; 1542 rx_ring->rx_skb_top = NULL;
1543 goto next_desc; 1543 goto next_desc;
1544 } 1544 }
1545
1546#define rxtop (rx_ring->rx_skb_top) 1545#define rxtop (rx_ring->rx_skb_top)
1547 if (!(staterr & E1000_RXD_STAT_EOP)) { 1546 if (!(staterr & E1000_RXD_STAT_EOP)) {
1548 /* this descriptor is only the beginning (or middle) */ 1547 /* this descriptor is only the beginning (or middle) */
@@ -1916,7 +1915,6 @@ static irqreturn_t e1000_intr_msix_tx(int __always_unused irq, void *data)
1916 struct e1000_hw *hw = &adapter->hw; 1915 struct e1000_hw *hw = &adapter->hw;
1917 struct e1000_ring *tx_ring = adapter->tx_ring; 1916 struct e1000_ring *tx_ring = adapter->tx_ring;
1918 1917
1919
1920 adapter->total_tx_bytes = 0; 1918 adapter->total_tx_bytes = 0;
1921 adapter->total_tx_packets = 0; 1919 adapter->total_tx_packets = 0;
1922 1920
@@ -4384,6 +4382,7 @@ static int e1000_close(struct net_device *netdev)
4384 4382
4385 return 0; 4383 return 0;
4386} 4384}
4385
4387/** 4386/**
4388 * e1000_set_mac - Change the Ethernet Address of the NIC 4387 * e1000_set_mac - Change the Ethernet Address of the NIC
4389 * @netdev: network interface device structure 4388 * @netdev: network interface device structure