ar71xx: Add GRO support to ag71xx

[openwrt/staging/hauke.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 a610406502d7511c094f0b75d43c69386f6a92dc..ae1bdf60662d805d891e18907ac663d443955d7b 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
@@ -527,6 +527,8 @@ static void ag71xx_fast_reset(struct ag71xx *ag)
        mii_reg = ag71xx_rr(ag, AG71XX_REG_MII_CFG);
        rx_ds = ag71xx_rr(ag, AG71XX_REG_RX_DESC);
 
+       ag71xx_tx_packets(ag, true);
+
        ath79_device_reset_set(reset_mask);
        udelay(10);
        ath79_device_reset_clear(reset_mask);
@@ -534,7 +536,6 @@ static void ag71xx_fast_reset(struct ag71xx *ag)
 
        ag71xx_dma_reset(ag);
        ag71xx_hw_setup(ag);
-       ag71xx_tx_packets(ag, true);
        ag->tx_ring.curr = 0;
        ag->tx_ring.dirty = 0;
        netdev_reset_queue(ag->dev);
@@ -1088,7 +1089,7 @@ next:
 
        while ((skb = __skb_dequeue(&queue)) != NULL) {
                skb->protocol = eth_type_trans(skb, dev);
-               netif_receive_skb(skb);
+               napi_gro_receive(&ag->napi, skb);
        }
 
        DBG("%s: rx finish, curr=%u, dirty=%u, done=%d\n",
@@ -1140,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(napi);
+               napi_complete_done(napi, rx_done);
 
                /* enable interrupts */
                spin_lock_irqsave(&ag->lock, flags);
@@ -1159,7 +1160,7 @@ oom:
                pr_info("%s: out of memory\n", dev->name);
 
        mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
-       napi_complete(napi);
+       napi_complete_done(napi, rx_done);
        return 0;
 }