diff options
author | Olof Johansson <olof@lixom.net> | 2007-08-22 10:12:55 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:50:56 -0400 |
commit | 73344863e426a3c56c7f3ac80fc6f1d4cb10460b (patch) | |
tree | c2476555efdb349dbe83da4335603ac2b4afc9d8 /drivers/net | |
parent | c0efd52b8b1951c20878208fdcbab0468f816804 (diff) |
pasemi_mac: Fix memcpy amount for short receives
Fix up memcpy for short receives.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/pasemi_mac.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index 46d5c0eef784..0d80b9d48c26 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c | |||
@@ -506,9 +506,7 @@ static int pasemi_mac_clean_rx(struct pasemi_mac *mac, int limit) | |||
506 | netdev_alloc_skb(mac->netdev, len + NET_IP_ALIGN); | 506 | netdev_alloc_skb(mac->netdev, len + NET_IP_ALIGN); |
507 | if (new_skb) { | 507 | if (new_skb) { |
508 | skb_reserve(new_skb, NET_IP_ALIGN); | 508 | skb_reserve(new_skb, NET_IP_ALIGN); |
509 | memcpy(new_skb->data - NET_IP_ALIGN, | 509 | memcpy(new_skb->data, skb->data, len); |
510 | skb->data - NET_IP_ALIGN, | ||
511 | len + NET_IP_ALIGN); | ||
512 | /* save the skb in buffer_info as good */ | 510 | /* save the skb in buffer_info as good */ |
513 | skb = new_skb; | 511 | skb = new_skb; |
514 | } | 512 | } |