summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2009-05-27 11:01:26 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2009-05-27 11:01:26 +0000
commitf3e22468c262e0f01c670f20ff077a2f29f0aecd (patch)
tree2ac04202773a359b0c00069a222280b9fe0da704
parentd96875f858a74e5b9cb85e565ccd3423ed8a0ccd (diff)
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. From dahdi-linux r6526. Issue: https://issues.asterisk.org/view.php?id=14963 git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4644 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r--kernel/wctc4xxp/base.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/wctc4xxp/base.c b/kernel/wctc4xxp/base.c
index ba810ff..1e65747 100644
--- a/kernel/wctc4xxp/base.c
+++ b/kernel/wctc4xxp/base.c
@@ -664,8 +664,10 @@ wctc4xxp_poll(struct napi_struct *napi, int budget)
if (!skb_queue_len(&wc->captured_packets)) {
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
netif_rx_complete(wc->netdev, &wc->napi);
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
netif_rx_complete(&wc->napi);
+#else
+ napi_complete(&wc->napi);
#endif
}
return count;
@@ -846,8 +848,10 @@ wctc4xxp_net_capture_cmd(struct wcdte *wc, const struct tcb *cmd)
netif_rx_schedule(netdev);
# elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
netif_rx_schedule(netdev, &wc->napi);
-# else
+# elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
netif_rx_schedule(&wc->napi);
+# else
+ napi_schedule(&wc->napi);
# endif
return;
}