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

dnet: replace obsolete *netif_rx_* functions with *napi_*

Browse Source 
*netif_rx_* functions is obsolete and removed in newer kernels so
we need to use corresponding *napi_* functions instead.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ilya Yanok
2009-03-13 09:51:46 -07:00
committed by David S. Miller
parent 6b7c5b947c
commit 9fae6c3f64
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/dnet.c
View File

@@ -408,7 +408,7 @@ static int dnet_poll(struct napi_struct *napi, int budget)
* packets waiting * packets waiting
*/ */
if (!(dnet_readl(bp, RX_FIFO_WCNT) >> 16)) { if (!(dnet_readl(bp, RX_FIFO_WCNT) >> 16)) {
netif_rx_complete(napi); napi_complete(napi);
int_enable = dnet_readl(bp, INTR_ENB); int_enable = dnet_readl(bp, INTR_ENB);
int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF; int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF;
dnet_writel(bp, int_enable, INTR_ENB); dnet_writel(bp, int_enable, INTR_ENB);
@@ -447,7 +447,7 @@ static int dnet_poll(struct napi_struct *napi, int budget)
if (npackets < budget) { if (npackets < budget) {
/* We processed all packets available. Tell NAPI it can /* We processed all packets available. Tell NAPI it can
* stop polling then re-enable rx interrupts */ * stop polling then re-enable rx interrupts */
netif_rx_complete(napi); napi_complete(napi);
int_enable = dnet_readl(bp, INTR_ENB); int_enable = dnet_readl(bp, INTR_ENB);
int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF; int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF;
dnet_writel(bp, int_enable, INTR_ENB); dnet_writel(bp, int_enable, INTR_ENB);
@@ -507,7 +507,7 @@ static irqreturn_t dnet_interrupt(int irq, void *dev_id)
} }
if (int_current & DNET_INTR_SRC_RX_CMDFIFOAF) { if (int_current & DNET_INTR_SRC_RX_CMDFIFOAF) {
if (netif_rx_schedule_prep(&bp->napi)) { if (napi_schedule_prep(&bp->napi)) {
/* /*
* There's no point taking any more interrupts * There's no point taking any more interrupts
* until we have processed the buffers * until we have processed the buffers
@@ -516,7 +516,7 @@ static irqreturn_t dnet_interrupt(int irq, void *dev_id)
int_enable = dnet_readl(bp, INTR_ENB); int_enable = dnet_readl(bp, INTR_ENB);
int_enable &= ~DNET_INTR_SRC_RX_CMDFIFOAF; int_enable &= ~DNET_INTR_SRC_RX_CMDFIFOAF;
dnet_writel(bp, int_enable, INTR_ENB); dnet_writel(bp, int_enable, INTR_ENB);
__netif_rx_schedule(&bp->napi); __napi_schedule(&bp->napi);
} }
handled = 1; handled = 1;
} }