Pull bugzilla-7880 into release branch

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

diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index e6c28fb423b234ba5c8f8892499923e36c1cd92e..0288279be9aad8d22ff1a7406eca2a67781833ec 100644 (file)
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -724,9 +724,8 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) {
                printk("%s: Memory squeeze, dropping packet.\n", dev->name);
                fep->stats.rx_dropped++;
        } else {
-               skb->dev = dev;
                skb_put(skb,pkt_len-4); /* Make room */
-               eth_copy_and_sum(skb, data, pkt_len-4, 0);
+               skb_copy_to_linear_data(skb, data, pkt_len-4);
                skb->protocol=eth_type_trans(skb,dev);
                netif_rx(skb);
        }
@@ -1879,7 +1878,7 @@ fec_restart(struct net_device *dev, int duplex)
        bdp--;
        bdp->cbd_sc |= BD_SC_WRAP;
 
-       /* ...and the same for transmmit.
+       /* ...and the same for transmit.
        */
        bdp = fep->tx_bd_base;
        for (i=0; i<TX_RING_SIZE; i++) {