aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 36f2bb666bf7..8ed823ae639e 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2330,7 +2330,7 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
2330 * Once we know the feature-set enabled for the device, we'll cache 2330 * Once we know the feature-set enabled for the device, we'll cache
2331 * the register offset the descriptor ring is assigned to. 2331 * the register offset the descriptor ring is assigned to.
2332 **/ 2332 **/
2333static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) 2333static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
2334{ 2334{
2335 int feature_mask = 0, rss_i; 2335 int feature_mask = 0, rss_i;
2336 int i, txr_idx, rxr_idx; 2336 int i, txr_idx, rxr_idx;
@@ -2367,7 +2367,7 @@ static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
2367 * number of queues at compile-time. The polling_netdev array is 2367 * number of queues at compile-time. The polling_netdev array is
2368 * intended for Multiqueue, but should work fine with a single queue. 2368 * intended for Multiqueue, but should work fine with a single queue.
2369 **/ 2369 **/
2370static int __devinit ixgbe_alloc_queues(struct ixgbe_adapter *adapter) 2370static int ixgbe_alloc_queues(struct ixgbe_adapter *adapter)
2371{ 2371{
2372 int i; 2372 int i;
2373 2373
@@ -2408,8 +2408,7 @@ err_tx_ring_allocation:
2408 * Attempt to configure the interrupts using the best available 2408 * Attempt to configure the interrupts using the best available
2409 * capabilities of the hardware and the kernel. 2409 * capabilities of the hardware and the kernel.
2410 **/ 2410 **/
2411static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter 2411static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
2412 *adapter)
2413{ 2412{
2414 int err = 0; 2413 int err = 0;
2415 int vector, v_budget; 2414 int vector, v_budget;
@@ -2501,7 +2500,7 @@ static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter)
2501 * - Hardware queue count (num_*_queues) 2500 * - Hardware queue count (num_*_queues)
2502 * - defined by miscellaneous hardware support/features (RSS, etc.) 2501 * - defined by miscellaneous hardware support/features (RSS, etc.)
2503 **/ 2502 **/
2504static int __devinit ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter) 2503static int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter)
2505{ 2504{
2506 int err; 2505 int err;
2507 2506