2 files changed, 12 insertions, 19 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 461596096383..88349b8fa39a 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -946,7 +946,6 @@ struct qlcnic_ipaddr {
 #define QLCNIC_PCI_REG_MSIX_TBL         0x44
 #define QLCNIC_MSIX_TBL_PGSIZE          4096
 
-#define QLCNIC_NETDEV_WEIGHT    128
 #define QLCNIC_ADAPTER_UP_MAGIC 777
 
 #define __QLCNIC_FW_ATTACHED            0
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index 8d06f884818d..b7b245b43b87 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -1458,7 +1458,7 @@ void qlcnic_82xx_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring)
 int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
                          struct net_device *netdev)
 {
-        int ring, max_sds_rings;
+        int ring;
         struct qlcnic_host_sds_ring *sds_ring;
         struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
         struct qlcnic_host_tx_ring *tx_ring;
@@ -1466,25 +1466,22 @@ int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
         if (qlcnic_alloc_sds_rings(recv_ctx, adapter->max_sds_rings))
                 return -ENOMEM;
 
-        max_sds_rings = adapter->max_sds_rings;
-
         for (ring = 0; ring < adapter->max_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
                 if (qlcnic_check_multi_tx(adapter) &&
                     !adapter->ahw->diag_test &&
                     (adapter->max_drv_tx_rings > 1)) {
                         netif_napi_add(netdev, &sds_ring->napi, qlcnic_rx_poll,
-                                        QLCNIC_NETDEV_WEIGHT * 2);
+                                       NAPI_POLL_WEIGHT);
                 } else {
                         if (ring == (adapter->max_sds_rings - 1))
                                 netif_napi_add(netdev, &sds_ring->napi,
                                                qlcnic_poll,
-                                               QLCNIC_NETDEV_WEIGHT /
-                                               max_sds_rings);
+                                               NAPI_POLL_WEIGHT);
                         else
                                 netif_napi_add(netdev, &sds_ring->napi,
                                                qlcnic_rx_poll,
-                                               QLCNIC_NETDEV_WEIGHT * 2);
+                                               NAPI_POLL_WEIGHT);
                 }
         }
 
@@ -1497,7 +1494,7 @@ int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
                 for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         netif_napi_add(netdev, &tx_ring->napi, qlcnic_tx_poll,
-                                       QLCNIC_NETDEV_WEIGHT);
+                                       NAPI_POLL_WEIGHT);
                 }
         }
 
@@ -1963,7 +1960,7 @@ void qlcnic_83xx_napi_disable(struct qlcnic_adapter *adapter)
 int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
                          struct net_device *netdev)
 {
-        int ring, max_sds_rings, temp;
+        int ring;
         struct qlcnic_host_sds_ring *sds_ring;
         struct qlcnic_host_tx_ring *tx_ring;
         struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
@@ -1971,25 +1968,22 @@ int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
         if (qlcnic_alloc_sds_rings(recv_ctx, adapter->max_sds_rings))
                 return -ENOMEM;
 
-        max_sds_rings = adapter->max_sds_rings;
         for (ring = 0; ring < adapter->max_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
                 if (adapter->flags & QLCNIC_MSIX_ENABLED) {
-                        if (!(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
+                        if (!(adapter->flags & QLCNIC_TX_INTR_SHARED))
                                 netif_napi_add(netdev, &sds_ring->napi,
                                                qlcnic_83xx_rx_poll,
-                                               QLCNIC_NETDEV_WEIGHT * 2);
-                        } else {
-                                temp = QLCNIC_NETDEV_WEIGHT / max_sds_rings;
+                                               NAPI_POLL_WEIGHT);
+                        else
                                 netif_napi_add(netdev, &sds_ring->napi,
                                                qlcnic_83xx_msix_sriov_vf_poll,
-                                               temp);
-                        }
+                                               NAPI_POLL_WEIGHT);
 
                 } else {
                         netif_napi_add(netdev, &sds_ring->napi,
                                        qlcnic_83xx_poll,
-                                       QLCNIC_NETDEV_WEIGHT / max_sds_rings);
+                                       NAPI_POLL_WEIGHT);
                 }
         }
 
@@ -2004,7 +1998,7 @@ int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
                         tx_ring = &adapter->tx_ring[ring];
                         netif_napi_add(netdev, &tx_ring->napi,
                                        qlcnic_83xx_msix_tx_poll,
-                                       QLCNIC_NETDEV_WEIGHT);
+                                       NAPI_POLL_WEIGHT);
                 }
         }