ag71xx: Switch from driver to kernel macro for NAPI_WEIGHT.

[openwrt/staging/chunkeey.git] / target / linux / ar71xx / files / drivers / net / ethernet / atheros / ag71xx / ag71xx_main.c

diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
index ae1bdf60662d805d891e18907ac663d443955d7b..e9a3d59fa3ee44becb48d9ad0ad644e4cc04dc46 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -1089,7 +1089,7 @@ next:
 
        while ((skb = __skb_dequeue(&queue)) != NULL) {
                skb->protocol = eth_type_trans(skb, dev);
-               napi_gro_receive(&ag->napi, skb);
+               netif_receive_skb(skb);
        }
 
        DBG("%s: rx finish, curr=%u, dirty=%u, done=%d\n",
@@ -1141,7 +1141,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                DBG("%s: disable polling mode, rx=%d, tx=%d,limit=%d\n",
                        dev->name, rx_done, tx_done, limit);
 
-               napi_complete_done(napi, rx_done);
+               napi_complete(napi);
 
                /* enable interrupts */
                spin_lock_irqsave(&ag->lock, flags);
@@ -1160,7 +1160,7 @@ oom:
                pr_info("%s: out of memory\n", dev->name);
 
        mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
-       napi_complete_done(napi, rx_done);
+       napi_complete(napi);
        return 0;
 }
 
@@ -1360,7 +1360,7 @@ static int ag71xx_probe(struct platform_device *pdev)
 
        memcpy(dev->dev_addr, pdata->mac_addr, ETH_ALEN);
 
-       netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
+       netif_napi_add(dev, &ag->napi, ag71xx_poll, NAPI_POLL_WEIGHT);
 
        ag71xx_dump_regs(ag);