[dahdi-commits] sruffell: linux/trunk r6526 - /linux/trunk/drivers/dahdi/wctc4xxp/base.c

[SVN commits to the DAHDI project]

Author: sruffell
Date: Wed Apr 29 12:48:32 2009
New Revision: 6526

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6526
Log:
wctc4xxp: Change netif_rx_xxx to napi_xxx

The netif_rx_xxx functions were dropped from the linux kernel source on
2009-01-21 in commit 288379f050284087578b77e04f040b57db3db3f8.

(closes issue #14963)
Reported by: tzafrir

Modified:
    linux/trunk/drivers/dahdi/wctc4xxp/base.c

Modified: linux/trunk/drivers/dahdi/wctc4xxp/base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=6526&r1=6525&r2=6526
==============================================================================
--- linux/trunk/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctc4xxp/base.c Wed Apr 29 12:48:32 2009
@@ -664,8 +664,10 @@
 	if (!skb_queue_len(&wc->captured_packets)) {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
 		netif_rx_complete(wc->netdev, &wc->napi);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+		netif_rx_complete(&wc->napi);
 #else
-		netif_rx_complete(&wc->napi);
+		napi_complete(&wc->napi);
 #endif
 	}
 	return count;
@@ -846,8 +848,10 @@
 	netif_rx_schedule(netdev);
 #	elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
 	netif_rx_schedule(netdev, &wc->napi);
+#	elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+	netif_rx_schedule(&wc->napi);
 #	else
-	netif_rx_schedule(&wc->napi);
+	napi_schedule(&wc->napi);
 #	endif
 	return;
 }