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 branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
net
/
es3210.c
diff --git
a/drivers/net/es3210.c
b/drivers/net/es3210.c
index
2d2ea94
..
822e5bf
100644
(file)
--- a/
drivers/net/es3210.c
+++ b/
drivers/net/es3210.c
@@
-375,7
+375,7
@@
static void es_block_input(struct net_device *dev, int count, struct sk_buff *sk
memcpy_fromio(skb->data + semi_count, ei_status.mem, count);
} else {
/* Packet is in one chunk. */
memcpy_fromio(skb->data + semi_count, ei_status.mem, count);
} else {
/* Packet is in one chunk. */
-
eth_io_copy_and_sum(skb, xfer_start, count, 0
);
+
memcpy_fromio(skb->data, xfer_start, count
);
}
}
}
}