diff options
author | Shaun Ruffell <sruffell@digium.com> | 2009-04-29 17:48:32 +0000 |
---|---|---|
committer | Shaun Ruffell <sruffell@digium.com> | 2009-04-29 17:48:32 +0000 |
commit | 2cae851799a6834e22c5aa95a83dcef8ebbf16dd (patch) | |
tree | 1425466310fc30c25617d0f2461e66a661fe233b | |
parent | fa1d8dc38d1e698f2d51edaf17a780d1bc607ef2 (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.
(closes issue #14963)
Reported by: tzafrir
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6526 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/wctc4xxp/base.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index 1793e7c..c0ccdf9 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/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; } |