projects
/
openwrt
/
staging
/
jow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "ar71xx: Add GRO support to ag71xx"
[openwrt/staging/jow.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..566e9513d8b7c6ef101902ae7d281dcc1c233893 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);
while ((skb = __skb_dequeue(&queue)) != NULL) {
skb->protocol = eth_type_trans(skb, dev);
- n
api_gro_receive(&ag->napi,
skb);
+ n
etif_receive_skb(
skb);
}
DBG("%s: rx finish, curr=%u, dirty=%u, done=%d\n",
}
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);
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);
/* 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);
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;
}
return 0;
}