projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[deliverable/linux.git]
/
drivers
/
net
/
b44.c
diff --git
a/drivers/net/b44.c
b/drivers/net/b44.c
index dc5f051005faaf2af5aafbf7fa46974537883e33..5c84541e07377ac80eb2a9da592b7645e6eb82c2 100644
(file)
--- a/
drivers/net/b44.c
+++ b/
drivers/net/b44.c
@@
-874,7
+874,7
@@
static int b44_poll(struct napi_struct *napi, int budget)
}
if (work_done < budget) {
}
if (work_done < budget) {
- n
etif_rx
_complete(napi);
+ n
api
_complete(napi);
b44_enable_ints(bp);
}
b44_enable_ints(bp);
}
@@
-906,13
+906,13
@@
static irqreturn_t b44_interrupt(int irq, void *dev_id)
goto irq_ack;
}
goto irq_ack;
}
- if (n
etif_rx
_schedule_prep(&bp->napi)) {
+ if (n
api
_schedule_prep(&bp->napi)) {
/* NOTE: These writes are posted by the readback of
* the ISTAT register below.
*/
bp->istat = istat;
__b44_disable_ints(bp);
/* NOTE: These writes are posted by the readback of
* the ISTAT register below.
*/
bp->istat = istat;
__b44_disable_ints(bp);
- __n
etif_rx
_schedule(&bp->napi);
+ __n
api
_schedule(&bp->napi);
} else {
printk(KERN_ERR PFX "%s: Error, poll already scheduled\n",
dev->name);
} else {
printk(KERN_ERR PFX "%s: Error, poll already scheduled\n",
dev->name);
@@
-973,7
+973,7
@@
static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
ssb_dma_unmap_single(bp->sdev, mapping, len,
DMA_TO_DEVICE);
ssb_dma_unmap_single(bp->sdev, mapping, len,
DMA_TO_DEVICE);
- bounce_skb = __
dev_alloc_skb(
len, GFP_ATOMIC | GFP_DMA);
+ bounce_skb = __
netdev_alloc_skb(dev,
len, GFP_ATOMIC | GFP_DMA);
if (!bounce_skb)
goto err_out;
if (!bounce_skb)
goto err_out;
This page took
0.024435 seconds
and
5
git commands to generate.