[source] Revert "ar71xx: Add GRO support to ag71xx"

LEDE Commits lede-commits at lists.infradead.org
Tue Oct 17 07:03:26 PDT 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/3db529d5ccdd5d8cec96d1e0f64583a1c9449a82

commit 3db529d5ccdd5d8cec96d1e0f64583a1c9449a82
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Oct 17 15:52:08 2017 +0200

    Revert "ar71xx: Add GRO support to ag71xx"
    
    This reverts commit 13e5e473699b92f171205e0f5c57c9ebe7922492.
    This commit causes a severe regression in LAN->WAN routing performance
    for several devices. This appears to be caused by the extra requirement
    to validate the SKB checksum early in the rx path, which the ethernet
    hardware does not do
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 ae1bdf6..566e951 100644
--- 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;
 }
 



More information about the lede-commits mailing list