Merge tag 'staging-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / staging / qlge / qlge_main.c

diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 6cd7fc9..ca6b966 100644 (file)
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -1976,7 +1976,7 @@ static unsigned long qlge_process_mac_rx_intr(struct qlge_adapter *qdev,
                                         vlan_id);
        } else {
                /* Non-TCP/UDP large frames that span multiple buffers
-                * can be processed corrrectly by the split frame logic.
+                * can be processed correctly by the split frame logic.
                 */
                qlge_process_mac_split_rx_intr(qdev, rx_ring, ib_mac_rsp,
                                               vlan_id);
@@ -2955,7 +2955,7 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
        void __iomem *doorbell_area =
                qdev->doorbell_area + (DB_PAGE_SIZE * (128 + rx_ring->cq_id));
        int err = 0;
-       u64 tmp;
+       u64 dma;
        __le64 *base_indirect_ptr;
        int page_entries;
 
@@ -3004,15 +3004,15 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
                FLAGS_LI;               /* Load irq delay values */
        if (rx_ring->cq_id < qdev->rss_ring_count) {
                cqicb->flags |= FLAGS_LL;       /* Load lbq values */
-               tmp = (u64)rx_ring->lbq.base_dma;
+               dma = (u64)rx_ring->lbq.base_dma;
                base_indirect_ptr = rx_ring->lbq.base_indirect;
-               page_entries = 0;
-               do {
-                       *base_indirect_ptr = cpu_to_le64(tmp);
-                       tmp += DB_PAGE_SIZE;
-                       base_indirect_ptr++;
-                       page_entries++;
-               } while (page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN));
+
+               for (page_entries = 0;
+                    page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN);
+                    page_entries++) {
+                       base_indirect_ptr[page_entries] = cpu_to_le64(dma);
+                       dma += DB_PAGE_SIZE;
+               }
                cqicb->lbq_addr = cpu_to_le64(rx_ring->lbq.base_indirect_dma);
                cqicb->lbq_buf_size =
                        cpu_to_le16(QLGE_FIT16(qdev->lbq_buf_size));
@@ -3021,15 +3021,15 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
                rx_ring->lbq.next_to_clean = 0;
 
                cqicb->flags |= FLAGS_LS;       /* Load sbq values */
-               tmp = (u64)rx_ring->sbq.base_dma;
+               dma = (u64)rx_ring->sbq.base_dma;
                base_indirect_ptr = rx_ring->sbq.base_indirect;
-               page_entries = 0;
-               do {
-                       *base_indirect_ptr = cpu_to_le64(tmp);
-                       tmp += DB_PAGE_SIZE;
-                       base_indirect_ptr++;
-                       page_entries++;
-               } while (page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN));
+
+               for (page_entries = 0;
+                    page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN);
+                    page_entries++) {
+                       base_indirect_ptr[page_entries] = cpu_to_le64(dma);
+                       dma += DB_PAGE_SIZE;
+               }
                cqicb->sbq_addr =
                        cpu_to_le64(rx_ring->sbq.base_indirect_dma);
                cqicb->sbq_buf_size = cpu_to_le16(SMALL_BUFFER_SIZE);
@@ -3041,8 +3041,8 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
                /* Inbound completion handling rx_rings run in
                 * separate NAPI contexts.
                 */
-               netif_napi_add(qdev->ndev, &rx_ring->napi, qlge_napi_poll_msix,
-                              64);
+               netif_napi_add_weight(qdev->ndev, &rx_ring->napi,
+                                     qlge_napi_poll_msix, 64);
                cqicb->irq_delay = cpu_to_le16(qdev->rx_coalesce_usecs);
                cqicb->pkt_delay = cpu_to_le16(qdev->rx_max_coalesced_frames);
        } else {