Pull bugzilla-7880 into release branch

[linux-2.6-omap-h63xx.git] / arch / ppc / 8xx_io / enet.c

diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index e58288e143698c17657cc7521bc0f754dbc33a02..703d47eee4362206e308f57f5d02015a3d0a7464 100644 (file)
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -506,9 +506,9 @@ for (;;) {
                }
                else {
                        skb_put(skb,pkt_len-4); /* Make room */
-                       eth_copy_and_sum(skb,
+                       skb_copy_to_linear_data(skb,
                                cep->rx_vaddr[bdp - cep->rx_bd_base],
-                               pkt_len-4, 0);
+                               pkt_len-4);
                        skb->protocol=eth_type_trans(skb,dev);
                        netif_rx(skb);
                }