From c6b43bcd506133bafcd8b544bba305b1c67dc156 Mon Sep 17 00:00:00 2001 From: Ilya Yanok Date: Fri, 13 Mar 2009 09:51:46 -0700 Subject: [PATCH] --- yaml --- r: 132391 b: refs/heads/master c: 9fae6c3f648e38f023b99b5f5a5280907b2e796e h: refs/heads/master i: 132389: de85d740474bc62dc51d54b36961d4f99a776ead 132387: a23b3114131d46ddb2d6ba3dbdd34ab09a5238c0 132383: 62ebf404059a95a0d5e988adaf01feced7b887f8 v: v3 --- [refs] | 2 +- trunk/drivers/net/dnet.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 39f7c3c969e9..bdd74da631af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b7c5b947c671a96e39f9526a5fd70c178b8dfd1 +refs/heads/master: 9fae6c3f648e38f023b99b5f5a5280907b2e796e diff --git a/trunk/drivers/net/dnet.c b/trunk/drivers/net/dnet.c index 4b96974fe76e..5c347f70cb67 100644 --- a/trunk/drivers/net/dnet.c +++ b/trunk/drivers/net/dnet.c @@ -408,7 +408,7 @@ static int dnet_poll(struct napi_struct *napi, int budget) * packets waiting */ 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_INTR_SRC_RX_CMDFIFOAF; dnet_writel(bp, int_enable, INTR_ENB); @@ -447,7 +447,7 @@ static int dnet_poll(struct napi_struct *napi, int budget) if (npackets < budget) { /* We processed all packets available. Tell NAPI it can * stop polling then re-enable rx interrupts */ - netif_rx_complete(napi); + napi_complete(napi); int_enable = dnet_readl(bp, INTR_ENB); int_enable |= DNET_INTR_SRC_RX_CMDFIFOAF; 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 (netif_rx_schedule_prep(&bp->napi)) { + if (napi_schedule_prep(&bp->napi)) { /* * There's no point taking any more interrupts * 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_INTR_SRC_RX_CMDFIFOAF; dnet_writel(bp, int_enable, INTR_ENB); - __netif_rx_schedule(&bp->napi); + __napi_schedule(&bp->napi); } handled = 1; }