diff options
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r-- | drivers/net/b44.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index c38512ebcea6..2a51c7579976 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -874,7 +874,7 @@ static int b44_poll(struct napi_struct *napi, int budget) | |||
874 | } | 874 | } |
875 | 875 | ||
876 | if (work_done < budget) { | 876 | if (work_done < budget) { |
877 | netif_rx_complete(napi); | 877 | napi_complete(napi); |
878 | b44_enable_ints(bp); | 878 | b44_enable_ints(bp); |
879 | } | 879 | } |
880 | 880 | ||
@@ -906,13 +906,13 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id) | |||
906 | goto irq_ack; | 906 | goto irq_ack; |
907 | } | 907 | } |
908 | 908 | ||
909 | if (netif_rx_schedule_prep(&bp->napi)) { | 909 | if (napi_schedule_prep(&bp->napi)) { |
910 | /* NOTE: These writes are posted by the readback of | 910 | /* NOTE: These writes are posted by the readback of |
911 | * the ISTAT register below. | 911 | * the ISTAT register below. |
912 | */ | 912 | */ |
913 | bp->istat = istat; | 913 | bp->istat = istat; |
914 | __b44_disable_ints(bp); | 914 | __b44_disable_ints(bp); |
915 | __netif_rx_schedule(&bp->napi); | 915 | __napi_schedule(&bp->napi); |
916 | } else { | 916 | } else { |
917 | printk(KERN_ERR PFX "%s: Error, poll already scheduled\n", | 917 | printk(KERN_ERR PFX "%s: Error, poll already scheduled\n", |
918 | dev->name); | 918 | dev->name); |
@@ -973,7 +973,7 @@ static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
973 | ssb_dma_unmap_single(bp->sdev, mapping, len, | 973 | ssb_dma_unmap_single(bp->sdev, mapping, len, |
974 | DMA_TO_DEVICE); | 974 | DMA_TO_DEVICE); |
975 | 975 | ||
976 | bounce_skb = __dev_alloc_skb(len, GFP_ATOMIC | GFP_DMA); | 976 | bounce_skb = __netdev_alloc_skb(dev, len, GFP_ATOMIC | GFP_DMA); |
977 | if (!bounce_skb) | 977 | if (!bounce_skb) |
978 | goto err_out; | 978 | goto err_out; |
979 | 979 | ||