aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorGreg Rose <gregory.v.rose@intel.com>2012-11-02 01:50:57 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-11-15 09:16:16 -0500
commitdee847f58fe9e615a78b06a70d27a7459e8ba6f0 (patch)
tree70b7dbb19dad69bbcab1ccc8d0e2d476a2858194 /drivers/net
parent31571757a4a595cce247d114eca8cbda86d59460 (diff)
ixgbevf: White space and comments clean up
Signed-off-by: Greg Rose <gregory.v.rose@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 592fe998a77f..57ae5cdd6416 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -121,7 +121,6 @@ static inline void ixgbevf_release_rx_desc(struct ixgbe_hw *hw,
121 * @direction: 0 for Rx, 1 for Tx, -1 for other causes 121 * @direction: 0 for Rx, 1 for Tx, -1 for other causes
122 * @queue: queue to map the corresponding interrupt to 122 * @queue: queue to map the corresponding interrupt to
123 * @msix_vector: the vector to map to the corresponding queue 123 * @msix_vector: the vector to map to the corresponding queue
124 *
125 */ 124 */
126static void ixgbevf_set_ivar(struct ixgbevf_adapter *adapter, s8 direction, 125static void ixgbevf_set_ivar(struct ixgbevf_adapter *adapter, s8 direction,
127 u8 queue, u8 msix_vector) 126 u8 queue, u8 msix_vector)
@@ -380,7 +379,6 @@ static void ixgbevf_alloc_rx_buffers(struct ixgbevf_adapter *adapter,
380no_buffers: 379no_buffers:
381 if (rx_ring->next_to_use != i) { 380 if (rx_ring->next_to_use != i) {
382 rx_ring->next_to_use = i; 381 rx_ring->next_to_use = i;
383
384 ixgbevf_release_rx_desc(&adapter->hw, rx_ring, i); 382 ixgbevf_release_rx_desc(&adapter->hw, rx_ring, i);
385 } 383 }
386} 384}
@@ -765,7 +763,6 @@ static irqreturn_t ixgbevf_msix_other(int irq, void *data)
765 return IRQ_HANDLED; 763 return IRQ_HANDLED;
766} 764}
767 765
768
769/** 766/**
770 * ixgbevf_msix_clean_rings - single unshared vector rx clean (all queues) 767 * ixgbevf_msix_clean_rings - single unshared vector rx clean (all queues)
771 * @irq: unused 768 * @irq: unused
@@ -1224,12 +1221,13 @@ static int ixgbevf_write_uc_addr_list(struct net_device *netdev)
1224} 1221}
1225 1222
1226/** 1223/**
1227 * ixgbevf_set_rx_mode - Multicast set 1224 * ixgbevf_set_rx_mode - Multicast and unicast set
1228 * @netdev: network interface device structure 1225 * @netdev: network interface device structure
1229 * 1226 *
1230 * The set_rx_method entry point is called whenever the multicast address 1227 * The set_rx_method entry point is called whenever the multicast address
1231 * list or the network interface flags are updated. This routine is 1228 * list, unicast address list or the network interface flags are updated.
1232 * responsible for configuring the hardware for proper multicast mode. 1229 * This routine is responsible for configuring the hardware for proper
1230 * multicast mode and configuring requested unicast filters.
1233 **/ 1231 **/
1234static void ixgbevf_set_rx_mode(struct net_device *netdev) 1232static void ixgbevf_set_rx_mode(struct net_device *netdev)
1235{ 1233{
@@ -1588,7 +1586,6 @@ static void ixgbevf_clean_tx_ring(struct ixgbevf_adapter *adapter,
1588 return; 1586 return;
1589 1587
1590 /* Free all the Tx ring sk_buffs */ 1588 /* Free all the Tx ring sk_buffs */
1591
1592 for (i = 0; i < tx_ring->count; i++) { 1589 for (i = 0; i < tx_ring->count; i++) {
1593 tx_buffer_info = &tx_ring->tx_buffer_info[i]; 1590 tx_buffer_info = &tx_ring->tx_buffer_info[i];
1594 ixgbevf_unmap_and_free_tx_resource(tx_ring, tx_buffer_info); 1591 ixgbevf_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);
@@ -1757,6 +1754,7 @@ static int ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
1757 */ 1754 */
1758 adapter->num_msix_vectors = vectors; 1755 adapter->num_msix_vectors = vectors;
1759 } 1756 }
1757
1760 return err; 1758 return err;
1761} 1759}
1762 1760
@@ -2053,7 +2051,7 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
2053 goto out; 2051 goto out;
2054 } 2052 }
2055 memcpy(adapter->netdev->dev_addr, adapter->hw.mac.addr, 2053 memcpy(adapter->netdev->dev_addr, adapter->hw.mac.addr,
2056 adapter->netdev->addr_len); 2054 adapter->netdev->addr_len);
2057 } 2055 }
2058 2056
2059 /* lock to protect mailbox accesses */ 2057 /* lock to protect mailbox accesses */
@@ -2198,7 +2196,6 @@ static void ixgbevf_watchdog_task(struct work_struct *work)
2198 * Always check the link on the watchdog because we have 2196 * Always check the link on the watchdog because we have
2199 * no LSC interrupt 2197 * no LSC interrupt
2200 */ 2198 */
2201
2202 spin_lock_bh(&adapter->mbx_lock); 2199 spin_lock_bh(&adapter->mbx_lock);
2203 2200
2204 need_reset = hw->mac.ops.check_link(hw, &link_speed, &link_up, false); 2201 need_reset = hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
@@ -2704,9 +2701,6 @@ static int ixgbevf_tso(struct ixgbevf_ring *tx_ring,
2704static bool ixgbevf_tx_csum(struct ixgbevf_ring *tx_ring, 2701static bool ixgbevf_tx_csum(struct ixgbevf_ring *tx_ring,
2705 struct sk_buff *skb, u32 tx_flags) 2702 struct sk_buff *skb, u32 tx_flags)
2706{ 2703{
2707
2708
2709
2710 u32 vlan_macip_lens = 0; 2704 u32 vlan_macip_lens = 0;
2711 u32 mss_l4len_idx = 0; 2705 u32 mss_l4len_idx = 0;
2712 u32 type_tucmd = 0; 2706 u32 type_tucmd = 0;
@@ -2896,7 +2890,6 @@ static void ixgbevf_tx_queue(struct ixgbevf_ring *tx_ring, int tx_flags,
2896 olinfo_status |= (1 << IXGBE_ADVTXD_IDX_SHIFT); 2890 olinfo_status |= (1 << IXGBE_ADVTXD_IDX_SHIFT);
2897 if (tx_flags & IXGBE_TX_FLAGS_IPV4) 2891 if (tx_flags & IXGBE_TX_FLAGS_IPV4)
2898 olinfo_status |= IXGBE_ADVTXD_POPTS_IXSM; 2892 olinfo_status |= IXGBE_ADVTXD_POPTS_IXSM;
2899
2900 } 2893 }
2901 2894
2902 /* 2895 /*