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, 8 insertions, 8 deletions

diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/qlge/qlge_ethtool.c
index eb6a9ee640ed..68f9bd280f86 100644
--- a/drivers/net/qlge/qlge_ethtool.c
+++ b/drivers/net/qlge/qlge_ethtool.c
@@ -49,10 +49,11 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev)
         /* Skip the default queue, and update the outbound handler
          * queues if they changed.
          */
-        cqicb = (struct cqicb *)&qdev->rx_ring[1];
+        cqicb = (struct cqicb *)&qdev->rx_ring[qdev->rss_ring_count];
         if (le16_to_cpu(cqicb->irq_delay) != qdev->tx_coalesce_usecs ||
-            le16_to_cpu(cqicb->pkt_delay) != qdev->tx_max_coalesced_frames) {
-                for (i = 1; i < qdev->rss_ring_first_cq_id; i++, rx_ring++) {
+                le16_to_cpu(cqicb->pkt_delay) !=
+                                qdev->tx_max_coalesced_frames) {
+                for (i = qdev->rss_ring_count; i < qdev->rx_ring_count; i++) {
                         rx_ring = &qdev->rx_ring[i];
                         cqicb = (struct cqicb *)rx_ring;
                         cqicb->irq_delay = cpu_to_le16(qdev->tx_coalesce_usecs);
@@ -70,12 +71,11 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev)
         }
 
         /* Update the inbound (RSS) handler queues if they changed. */
-        cqicb = (struct cqicb *)&qdev->rx_ring[qdev->rss_ring_first_cq_id];
+        cqicb = (struct cqicb *)&qdev->rx_ring[0];
         if (le16_to_cpu(cqicb->irq_delay) != qdev->rx_coalesce_usecs ||
-            le16_to_cpu(cqicb->pkt_delay) != qdev->rx_max_coalesced_frames) {
-                for (i = qdev->rss_ring_first_cq_id;
-                     i <= qdev->rss_ring_first_cq_id + qdev->rss_ring_count;
-                     i++) {
+                le16_to_cpu(cqicb->pkt_delay) !=
+                                        qdev->rx_max_coalesced_frames) {
+                for (i = 0; i < qdev->rss_ring_count; i++, rx_ring++) {
                         rx_ring = &qdev->rx_ring[i];
                         cqicb = (struct cqicb *)rx_ring;
                         cqicb->irq_delay = cpu_to_le16(qdev->rx_coalesce_usecs);