projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spidernet: node-aware skbuff allocation
[powerpc.git]
/
drivers
/
net
/
smc-ultra.c
diff --git
a/drivers/net/smc-ultra.c
b/drivers/net/smc-ultra.c
index
7986514
..
a52b22d
100644
(file)
--- a/
drivers/net/smc-ultra.c
+++ b/
drivers/net/smc-ultra.c
@@
-127,7
+127,7
@@
MODULE_DEVICE_TABLE(isapnp, ultra_device_ids);
static void ultra_poll(struct net_device *dev)
{
disable_irq(dev->irq);
static void ultra_poll(struct net_device *dev)
{
disable_irq(dev->irq);
- ei_interrupt(dev->irq, dev
, NULL
);
+ ei_interrupt(dev->irq, dev);
enable_irq(dev->irq);
}
#endif
enable_irq(dev->irq);
}
#endif
@@
-454,8
+454,7
@@
ultra_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ri
count -= semi_count;
memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
} else {
count -= semi_count;
memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
} else {
- /* Packet is in one chunk -- we can copy + cksum. */
- eth_io_copy_and_sum(skb, xfer_start, count, 0);
+ memcpy_fromio(skb->data, xfer_start, count);
}
outb(0x00, dev->base_addr - ULTRA_NIC_OFFSET); /* Disable memory. */
}
outb(0x00, dev->base_addr - ULTRA_NIC_OFFSET); /* Disable memory. */
@@
-593,7
+592,7
@@
static void cleanup_card(struct net_device *dev)
iounmap(ei_status.mem);
}
iounmap(ei_status.mem);
}
-void
+void
__exit
cleanup_module(void)
{
int this_dev;
cleanup_module(void)
{
int this_dev;