diff options
author | Ilya Yanok <yanok@emcraft.com> | 2009-03-13 12:51:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-13 12:51:46 -0400 |
commit | 9fae6c3f648e38f023b99b5f5a5280907b2e796e (patch) | |
tree | 7e180764b105d1950a938eafadcbd411323fb551 /drivers/net/dnet.c | |
parent | 6b7c5b947c671a96e39f9526a5fd70c178b8dfd1 (diff) |
dnet: replace obsolete *netif_rx_* functions with *napi_*
*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>
Diffstat (limited to 'drivers/net/dnet.c')
-rw-r--r-- | drivers/net/dnet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c index 4b96974fe76e..5c347f70cb67 100644 --- a/drivers/net/dnet.c +++ b/drivers/net/dnet.c | |||
@@ -408,7 +408,7 @@ static int dnet_poll(struct napi_struct *napi, int budget) | |||
408 | * packets waiting | 408 | * packets waiting |
409 | */ | 409 | */ |
410 | if (!(dnet_readl(bp, RX_FIFO_WCNT) >> 16)) { | 410 | if (!(dnet_readl(bp, RX_FIFO_WCNT) >> 16)) { |
411 | netif_rx_complete(napi); | 411 | napi_complete(napi); |
412 | int_enable = dnet_readl(bp, INTR_ENB); | 412 | int_enable = dnet_readl(bp, INTR_ENB); |
413 | int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF; | 413 | int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF; |
414 | dnet_writel(bp, int_enable, INTR_ENB); | 414 | dnet_writel(bp, int_enable, INTR_ENB); |
@@ -447,7 +447,7 @@ static int dnet_poll(struct napi_struct *napi, int budget) | |||
447 | if (npackets < budget) { | 447 | if (npackets < budget) { |
448 | /* We processed all packets available. Tell NAPI it can | 448 | /* We processed all packets available. Tell NAPI it can |
449 | * stop polling then re-enable rx interrupts */ | 449 | * stop polling then re-enable rx interrupts */ |
450 | netif_rx_complete(napi); | 450 | napi_complete(napi); |
451 | int_enable = dnet_readl(bp, INTR_ENB); | 451 | int_enable = dnet_readl(bp, INTR_ENB); |
452 | int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF; | 452 | int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF; |
453 | dnet_writel(bp, int_enable, INTR_ENB); | 453 | dnet_writel(bp, int_enable, INTR_ENB); |
@@ -507,7 +507,7 @@ static irqreturn_t dnet_interrupt(int irq, void *dev_id) | |||
507 | } | 507 | } |
508 | 508 | ||
509 | if (int_current & DNET_INTR_SRC_RX_CMDFIFOAF) { | 509 | if (int_current & DNET_INTR_SRC_RX_CMDFIFOAF) { |
510 | if (netif_rx_schedule_prep(&bp->napi)) { | 510 | if (napi_schedule_prep(&bp->napi)) { |
511 | /* | 511 | /* |
512 | * There's no point taking any more interrupts | 512 | * There's no point taking any more interrupts |
513 | * until we have processed the buffers | 513 | * until we have processed the buffers |
@@ -516,7 +516,7 @@ static irqreturn_t dnet_interrupt(int irq, void *dev_id) | |||
516 | int_enable = dnet_readl(bp, INTR_ENB); | 516 | int_enable = dnet_readl(bp, INTR_ENB); |
517 | int_enable &= ~DNET_INTR_SRC_RX_CMDFIFOAF; | 517 | int_enable &= ~DNET_INTR_SRC_RX_CMDFIFOAF; |
518 | dnet_writel(bp, int_enable, INTR_ENB); | 518 | dnet_writel(bp, int_enable, INTR_ENB); |
519 | __netif_rx_schedule(&bp->napi); | 519 | __napi_schedule(&bp->napi); |
520 | } | 520 | } |
521 | handled = 1; | 521 | handled = 1; |
522 | } | 522 | } |