qlge: Get rid of 'default' rx_ring type.

Currently we have three types of RX rings.

1) Default ring - services rx_ring for broadcast/multicast, handles
firmware events, and errors.

2) TX completion ring - handles only outbound completions.

3) RSS ring - handles only inbound completions.

This patch gets rid of the default ring type and moves it's functionality
into the first RSS ring.  This makes better use of MSIX vectors since
they are a limited resource on some platforms.

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index 6ed5317ab1c0..ed5dbca01bd1 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -1287,7 +1287,7 @@ struct rx_ring {
         u32 sbq_free_cnt;       /* free buffer desc cnt */
 
         /* Misc. handler elements. */
-        u32 type;               /* Type of queue, tx, rx, or default. */
+        u32 type;               /* Type of queue, tx, rx. */
         u32 irq;                /* Which vector this ring is assigned. */
         u32 cpu;                /* Which CPU this should run on. */
         char name[IFNAMSIZ + 5];
@@ -1486,11 +1486,9 @@ struct ql_adapter {
         struct intr_context intr_context[MAX_RX_RINGS];
 
         int tx_ring_count;      /* One per online CPU. */
-        u32 rss_ring_first_cq_id;/* index of first inbound (rss) rx_ring */
         u32 rss_ring_count;     /* One per online CPU.  */
         /*
          * rx_ring_count =
-         *  one default queue +
          *  (CPU count * outbound completion rx_ring) +
          *  (CPU count * inbound (RSS) completion rx_ring)
          */