MSCAN: fix netdev napi name changes starting with 2.6.29

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
git-svn-id: svn://svn.berlios.de//socketcan/trunk@923 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/mscan/mscan.c b/kernel/2.6/drivers/net/can/mscan/mscan.c
index 785cf97cf9e5d77f1e29c472b455dd9e6852f77c..b32b7a43af6ddf684d6018fc5b2314d6ebef2ce3 100644 (file)
--- a/kernel/2.6/drivers/net/can/mscan/mscan.c
+++ b/kernel/2.6/drivers/net/can/mscan/mscan.c
@@ -477,7 +477,7 @@ static int mscan_rx_poll(struct net_device *dev, int *budget)
 
        if (!(in_8(&regs->canrflg) & (MSCAN_RXF | MSCAN_ERR_IF))) {
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
-               netif_rx_complete(&priv->napi);
+               napi_complete(&priv->napi);
 #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,23)
                netif_rx_complete(dev, &priv->napi);
 #else
@@ -568,7 +568,7 @@ static irqreturn_t mscan_isr(int irq, void *dev_id)
                        priv->shadow_canrier = in_8(&regs->canrier);
                        out_8(&regs->canrier, 0);
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
-                       netif_rx_schedule(&priv->napi);
+                       napi_schedule(&priv->napi);
 #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,23)
                        netif_rx_schedule(dev, &priv->napi);
 #else