diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2010-11-16 22:27:09 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2010-11-16 22:27:09 -0500 |
commit | d0759ebb051972f8557a19aa13cf02fc314856e9 (patch) | |
tree | 75b7d8bf65e32d7bd734063f1a7d4f5b224676bd /drivers/net/ixgbe/ixgbe.h | |
parent | 125601bf03a13e24d3785ccbc3a25ad401c92772 (diff) |
ixgbe: cleanup ixgbe_map_rings_to_vectors
This change cleans up some of the items in ixgbe_map_rings_to_vectors.
Specifically it merges the two for loops and drops the unnecessary vectors
parameter.
It also moves the vector names into the q_vectors themselves.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe.h')
-rw-r--r-- | drivers/net/ixgbe/ixgbe.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h index 6d9fcb4e0854..ce43c9352681 100644 --- a/drivers/net/ixgbe/ixgbe.h +++ b/drivers/net/ixgbe/ixgbe.h | |||
@@ -282,6 +282,7 @@ struct ixgbe_q_vector { | |||
282 | u8 rx_itr; | 282 | u8 rx_itr; |
283 | u32 eitr; | 283 | u32 eitr; |
284 | cpumask_var_t affinity_mask; | 284 | cpumask_var_t affinity_mask; |
285 | char name[IFNAMSIZ + 9]; | ||
285 | }; | 286 | }; |
286 | 287 | ||
287 | /* Helper macros to switch between ints/sec and what the register uses. | 288 | /* Helper macros to switch between ints/sec and what the register uses. |
@@ -330,7 +331,6 @@ struct ixgbe_adapter { | |||
330 | u16 bd_number; | 331 | u16 bd_number; |
331 | struct work_struct reset_task; | 332 | struct work_struct reset_task; |
332 | struct ixgbe_q_vector *q_vector[MAX_MSIX_Q_VECTORS]; | 333 | struct ixgbe_q_vector *q_vector[MAX_MSIX_Q_VECTORS]; |
333 | char name[MAX_MSIX_COUNT][IFNAMSIZ + 9]; | ||
334 | struct ixgbe_dcb_config dcb_cfg; | 334 | struct ixgbe_dcb_config dcb_cfg; |
335 | struct ixgbe_dcb_config temp_dcb_cfg; | 335 | struct ixgbe_dcb_config temp_dcb_cfg; |
336 | u8 dcb_set_bitmap; | 336 | u8 dcb_set_bitmap; |
@@ -453,6 +453,7 @@ struct ixgbe_adapter { | |||
453 | int node; | 453 | int node; |
454 | struct work_struct check_overtemp_task; | 454 | struct work_struct check_overtemp_task; |
455 | u32 interrupt_event; | 455 | u32 interrupt_event; |
456 | char lsc_int_name[IFNAMSIZ + 9]; | ||
456 | 457 | ||
457 | /* SR-IOV */ | 458 | /* SR-IOV */ |
458 | DECLARE_BITMAP(active_vfs, IXGBE_MAX_VF_FUNCTIONS); | 459 | DECLARE_BITMAP(active_vfs, IXGBE_MAX_VF_FUNCTIONS); |