]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
dnet: replace obsolete *netif_rx_* functions with *napi_*
authorIlya Yanok <yanok@emcraft.com>
Fri, 13 Mar 2009 16:51:46 +0000 (09:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Mar 2009 16:51:46 +0000 (09:51 -0700)
*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>
drivers/net/dnet.c

index 4b96974fe76e5aa17af9b9cdefd66ba9ce1038fb..5c347f70cb6726fda8078aec5b0c4827f2b2e346 100644 (file)
@@ -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;
        }