openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ks8695net: add GRO support 

Use napi_complete_done() instead of __napi_complete() to :

1) Get support of gro_flush_timeout if opt-in
2) Not rearm interrupts for busy-polling users.
3) use standard NAPI API.

Note that rx_lock seems to be useless, NAPI logic should
not need this extra care.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2017-02-04 15:24:58 -08:00 committed by David S. Miller
parent 135844ef9f
commit 7ea4007757
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/micrel/ks8695net.c
View File

@ -519,7 +519,7 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget)
/* Relinquish the SKB to the network layer */ /* Relinquish the SKB to the network layer */
skb_put(skb, pktlen); skb_put(skb, pktlen);
skb->protocol = eth_type_trans(skb, ndev); skb->protocol = eth_type_trans(skb, ndev);
netif_receive_skb(skb); napi_gro_receive(&ksp->napi, skb);
/* Record stats */ /* Record stats */
ndev->stats.rx_packets++; ndev->stats.rx_packets++;
@ -561,18 +561,17 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget)
static int ks8695_poll(struct napi_struct *napi, int budget) static int ks8695_poll(struct napi_struct *napi, int budget)
{ {
struct ks8695_priv *ksp = container_of(napi, struct ks8695_priv, napi); struct ks8695_priv *ksp = container_of(napi, struct ks8695_priv, napi);
unsigned long work_done;
unsigned long isr = readl(KS8695_IRQ_VA + KS8695_INTEN); unsigned long isr = readl(KS8695_IRQ_VA + KS8695_INTEN);
unsigned long mask_bit = 1 << ks8695_get_rx_enable_bit(ksp); unsigned long mask_bit = 1 << ks8695_get_rx_enable_bit(ksp);
int work_done;
work_done = ks8695_rx(ksp, budget); work_done = ks8695_rx(ksp, budget);
if (work_done < budget) { if (work_done < budget && napi_complete_done(napi, work_done)) {
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ksp->rx_lock, flags); spin_lock_irqsave(&ksp->rx_lock, flags);
__napi_complete(napi); /* enable rx interrupt */
/*enable rx interrupt*/
writel(isr | mask_bit, KS8695_IRQ_VA + KS8695_INTEN); writel(isr | mask_bit, KS8695_IRQ_VA + KS8695_INTEN);
spin_unlock_irqrestore(&ksp->rx_lock, flags); spin_unlock_irqrestore(&ksp->rx_lock, flags);
} }