Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 135844ef authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

skge: use napi_complete_done() 



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 and get rid of napi_gro_flush()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a3961789

drivers/net/ethernet/marvell/skge.c

+3 −5
Original line number Diff line number Diff line
@@ -3201,7 +3201,7 @@ static void skge_tx_done(struct net_device *dev) 
	}

}



static int skge_poll(struct napi_struct *napi, int to_do)

static int skge_poll(struct napi_struct *napi, int budget)

{

	struct skge_port *skge = container_of(napi, struct skge_port, napi);

	struct net_device *dev = skge->netdev;
@@ -3214,7 +3214,7 @@ static int skge_poll(struct napi_struct *napi, int to_do) 


	skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_IRQ_CL_F);



	for (e = ring->to_clean; prefetch(e->next), work_done < to_do; e = e->next) {

	for (e = ring->to_clean; prefetch(e->next), work_done < budget; e = e->next) {

		struct skge_rx_desc *rd = e->desc;

		struct sk_buff *skb;

		u32 control;
@@ -3236,12 +3236,10 @@ static int skge_poll(struct napi_struct *napi, int to_do) 
	wmb();

	skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START);



	if (work_done < to_do) {

	if (work_done < budget && napi_complete_done(napi, work_done)) {

		unsigned long flags;



		napi_gro_flush(napi, false);

		spin_lock_irqsave(&hw->hw_lock, flags);

		__napi_complete(napi);

		hw->intr_mask |= napimask[skge->port];

		skge_write32(hw, B0_IMSK, hw->intr_mask);

		skge_read32(hw, B0_IMSK);