Skip to content

Commit

Permalink
ixgbe: Move ring features into an enum, allowing easier future mainte…
Browse files Browse the repository at this point in the history
…nance

From: Shannon Nelson <shannon.nelson@intel.com>

The ring_feature member of ixgbe_adapter is statically allocated based on
the supported features of the device.  When a new feature is added, we need
to manually update the static allocation.  This patch makes the feature
list an enum, eliminating the need for multiple updates to the code when
adding a new feature.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Shannon Nelson authored and David S. Miller committed Feb 25, 2009
1 parent 5325a7b commit c7e4358
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions drivers/net/ixgbe/ixgbe.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,15 @@ struct ixgbe_ring {
u16 rx_buf_len;
};

#define RING_F_DCB 0
#define RING_F_VMDQ 1
#define RING_F_RSS 2
enum ixgbe_ring_f_enum {
RING_F_NONE = 0,
RING_F_DCB,
RING_F_VMDQ,
RING_F_RSS,

RING_F_ARRAY_SIZE /* must be last in enum set */
};

#define IXGBE_MAX_DCB_INDICES 8
#define IXGBE_MAX_RSS_INDICES 16
#define IXGBE_MAX_VMDQ_INDICES 16
Expand Down Expand Up @@ -249,7 +255,7 @@ struct ixgbe_adapter {
u64 non_eop_descs;
int num_msix_vectors;
int max_msix_q_vectors; /* true count of q_vectors for device */
struct ixgbe_ring_feature ring_feature[3];
struct ixgbe_ring_feature ring_feature[RING_F_ARRAY_SIZE];
struct msix_entry *msix_entries;

u64 rx_hdr_split;
Expand Down

0 comments on commit c7e4358

Please sign in to comment.