git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ide: fix locking for manual DMA enable/disable ("hdparm -d")
[safe/jmp/linux-2.6]
/
drivers
/
net
/
smc-ultra32.c
diff --git
a/drivers/net/smc-ultra32.c
b/drivers/net/smc-ultra32.c
index
e10755e
..
88a30e5
100644
(file)
--- a/
drivers/net/smc-ultra32.c
+++ b/
drivers/net/smc-ultra32.c
@@
-395,8
+395,7
@@
static void ultra32_block_input(struct net_device *dev,
memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
}
} else {
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);
}
}
}
}
@@
-437,7
+436,7
@@
int __init init_module(void)
return -ENXIO;
}
return -ENXIO;
}
-void cleanup_module(void)
+void
__exit
cleanup_module(void)
{
int this_dev;
{
int this_dev;