aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-03-05 10:57:47 -0500
committerDavid S. Miller <davem@davemloft.net>2013-03-05 23:40:01 -0500
commit6fac41157252220678b210fcb13e2c3dad7a912a (patch)
tree19f9e0b2c204c8a8f83d52dbc7216eef8386526a
parent82dc3c63c692b1e1d59378ecee948ac88e034aad (diff)
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>
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x.h1
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h4
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index e4605a965084..9577cceafac4 100644
--- 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 {
492struct bnx2x_fastpath { 492struct bnx2x_fastpath {
493 struct bnx2x *bp; /* parent */ 493 struct bnx2x *bp; /* parent */
494 494
495#define BNX2X_NAPI_WEIGHT 128
496 struct napi_struct napi; 495 struct napi_struct napi;
497 union host_hc_status_block status_blk; 496 union host_hc_status_block status_blk;
498 /* chip independed shortcuts into sb structure */ 497 /* 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 aee7671ff4c1..8d158d8240a2 100644
--- 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)
834 /* Add NAPI objects */ 834 /* Add NAPI objects */
835 for_each_rx_queue_cnic(bp, i) 835 for_each_rx_queue_cnic(bp, i)
836 netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi), 836 netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
837 bnx2x_poll, BNX2X_NAPI_WEIGHT); 837 bnx2x_poll, NAPI_POLL_WEIGHT);
838} 838}
839 839
840static inline void bnx2x_add_all_napi(struct bnx2x *bp) 840static inline void bnx2x_add_all_napi(struct bnx2x *bp)
@@ -844,7 +844,7 @@ static inline void bnx2x_add_all_napi(struct bnx2x *bp)
844 /* Add NAPI objects */ 844 /* Add NAPI objects */
845 for_each_eth_queue(bp, i) 845 for_each_eth_queue(bp, i)
846 netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi), 846 netif_napi_add(bp->dev, &bnx2x_fp(bp, i, napi),
847 bnx2x_poll, BNX2X_NAPI_WEIGHT); 847 bnx2x_poll, NAPI_POLL_WEIGHT);
848} 848}
849 849
850static inline void bnx2x_del_all_napi_cnic(struct bnx2x *bp) 850static inline void bnx2x_del_all_napi_cnic(struct bnx2x *bp)