bnx2x: use the default NAPI weight

BQL (Byte Queue Limits) proper operation needs TX completion
being serviced in a timely fashion.

bnx2x uses a non standard NAPI poll weight, and thats not fair to other
napi poll handlers, and even not reasonable.

Use the default value instead.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index e4605a9..9577cce 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -492,7 +492,6 @@ enum bnx2x_tpa_mode_t {
 struct bnx2x_fastpath {
        struct bnx2x            *bp; /* parent */
 
 struct bnx2x_fastpath {
        struct bnx2x            *bp; /* parent */
 

-#define BNX2X_NAPI_WEIGHT       128

        struct napi_struct      napi;
        union host_hc_status_block      status_blk;
        /* chip independed shortcuts into sb structure */
        struct napi_struct      napi;
        union host_hc_status_block      status_blk;
        /* chip independed shortcuts into sb structure */

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index aee7671..8d158d8 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -834,7 +834,7 @@ static inline void bnx2x_add_all_napi_cnic(struct bnx2x *bp)
        /* Add NAPI objects */
        for_each_rx_queue_cnic(bp, i)
                netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
        /* Add NAPI objects */
        for_each_rx_queue_cnic(bp, i)
                netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),

-                              bnx2x_poll, BNX2X_NAPI_WEIGHT);
+                              bnx2x_poll, NAPI_POLL_WEIGHT);

 }
 
 static inline void bnx2x_add_all_napi(struct bnx2x *bp)
 }
 
 static inline void bnx2x_add_all_napi(struct bnx2x *bp)


@@ -844,7 +844,7 @@ static inline void bnx2x_add_all_napi(struct bnx2x *bp)
        /* Add NAPI objects */
        for_each_eth_queue(bp, i)
                netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
        /* Add NAPI objects */
        for_each_eth_queue(bp, i)
                netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),

-                              bnx2x_poll, BNX2X_NAPI_WEIGHT);
+                              bnx2x_poll, NAPI_POLL_WEIGHT);

 }
 
 static inline void bnx2x_del_all_napi_cnic(struct bnx2x *bp)
 }
 
 static inline void bnx2x_del_all_napi_cnic(struct bnx2x *bp)