summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2013-05-13 23:54:20 +0000
committerDavid S. Miller <davem@davemloft.net>2013-05-14 11:32:05 -0700
commita3659aa09a2ee7e0028349b9100d8b4a7750a4be (patch)
tree40fa8df73adc1e03a995e38179477376f1bf17d8
parent54d27fcb338bd9c42d1dfc5a39e18f6f9d373c2e (diff)
downloadlinux-stable-a3659aa09a2ee7e0028349b9100d8b4a7750a4be.tar.gz
linux-stable-a3659aa09a2ee7e0028349b9100d8b4a7750a4be.tar.bz2
linux-stable-a3659aa09a2ee7e0028349b9100d8b4a7750a4be.zip
mv643xx_eth: fix NAPI weight being > 64
3.10-rc1 issues the following warning: netif_napi_add() called with weight 128 on device eth%d This patch reduce the weight to 64, using NAPI_POLL_WEIGHT. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/marvell/mv643xx_eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index d0afeea181fb..8f63c36b2cdc 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2745,7 +2745,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
INIT_WORK(&mp->tx_timeout_task, tx_timeout_task);
- netif_napi_add(dev, &mp->napi, mv643xx_eth_poll, 128);
+ netif_napi_add(dev, &mp->napi, mv643xx_eth_poll, NAPI_POLL_WEIGHT);
init_timer(&mp->rx_oom);
mp->rx_oom.data = (unsigned long)mp;