git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
[pandora-kernel.git]
/
drivers
/
net
/
ac3200.c
diff --git
a/drivers/net/ac3200.c
b/drivers/net/ac3200.c
index
c01f87f
..
644c408
100644
(file)
--- a/
drivers/net/ac3200.c
+++ b/
drivers/net/ac3200.c
@@
-327,8
+327,7
@@
static void ac_block_input(struct net_device *dev, int count, struct sk_buff *sk
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, start, count, 0);
+ memcpy_fromio(skb->data, start, count);
}
}