diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
| commit | 7baca6ad0ef09c8a78d798c93a3ce25336e8f50f (patch) | |
| tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /drivers/net/ac3200.c | |
| parent | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
Merge branch 'master' into for_paulus
Diffstat (limited to 'drivers/net/ac3200.c')
| -rw-r--r-- | drivers/net/ac3200.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c index c01f87f5bed7..644c408515df 100644 --- 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); } } |