From: Olof Johansson Date: Wed, 22 Aug 2007 14:12:55 +0000 (-0500) Subject: pasemi_mac: Fix memcpy amount for short receives X-Git-Tag: upstream/snapshot3+hdmi~30758^2~514 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73344863e426a3c56c7f3ac80fc6f1d4cb10460b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git pasemi_mac: Fix memcpy amount for short receives Fix up memcpy for short receives. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index 46d5c0e..0d80b9d 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) netdev_alloc_skb(mac->netdev, len + NET_IP_ALIGN); if (new_skb) { skb_reserve(new_skb, NET_IP_ALIGN); - memcpy(new_skb->data - NET_IP_ALIGN, - skb->data - NET_IP_ALIGN, - len + NET_IP_ALIGN); + memcpy(new_skb->data, skb->data, len); /* save the skb in buffer_info as good */ skb = new_skb; }