lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: Remove redundant NAPI functions

Browse Source 
Following the removal of the unused struct net_device * parameter from
the NAPI functions named *netif_rx_* in commit 908a7a1, they are
exactly equivalent to the corresponding *napi_* functions and are
therefore redundant.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings
2009-01-19 16:43:59 -08:00
committed by David S. Miller
parent 627af770c6
commit 288379f050
66 changed files with 227 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/bnx2x_main.c
View File

@ -1647,7 +1647,7 @@ static irqreturn_t bnx2x_msix_fp_int(int irq, void *fp_cookie)
prefetch(&fp->status_blk->c_status_block.status_block_index);
prefetch(&fp->status_blk->u_status_block.status_block_index);
netif_rx_schedule(&bnx2x_fp(bp, index, napi));
napi_schedule(&bnx2x_fp(bp, index, napi));
return IRQ_HANDLED;
}
@ -1686,7 +1686,7 @@ static irqreturn_t bnx2x_interrupt(int irq, void *dev_instance)
prefetch(&fp->status_blk->c_status_block.status_block_index);
prefetch(&fp->status_blk->u_status_block.status_block_index);
netif_rx_schedule(&bnx2x_fp(bp, 0, napi));
napi_schedule(&bnx2x_fp(bp, 0, napi));
status &= ~mask;
}
@ -9339,7 +9339,7 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)
#ifdef BNX2X_STOP_ON_ERROR
poll_panic:
#endif
netif_rx_complete(napi);
napi_complete(napi);
bnx2x_ack_sb(bp, FP_SB_ID(fp), USTORM_ID,
le16_to_cpu(fp->fp_u_idx), IGU_INT_NOP, 1);