diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ppc/8260_io/enet.c | 4 | ||||
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 4 | ||||
-rw-r--r-- | arch/ppc/8xx_io/enet.c | 4 | ||||
-rw-r--r-- | arch/ppc/8xx_io/fec.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c index 4c0a7d732f69..615b6583d9b0 100644 --- a/arch/ppc/8260_io/enet.c +++ b/arch/ppc/8260_io/enet.c | |||
@@ -477,9 +477,9 @@ for (;;) { | |||
477 | } | 477 | } |
478 | else { | 478 | else { |
479 | skb_put(skb,pkt_len-4); /* Make room */ | 479 | skb_put(skb,pkt_len-4); /* Make room */ |
480 | eth_copy_and_sum(skb, | 480 | skb_copy_to_linear_data(skb, |
481 | (unsigned char *)__va(bdp->cbd_bufaddr), | 481 | (unsigned char *)__va(bdp->cbd_bufaddr), |
482 | pkt_len-4, 0); | 482 | pkt_len-4); |
483 | skb->protocol=eth_type_trans(skb,dev); | 483 | skb->protocol=eth_type_trans(skb,dev); |
484 | netif_rx(skb); | 484 | netif_rx(skb); |
485 | } | 485 | } |
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index cab395da25da..6f3ed6a72e0b 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -734,9 +734,9 @@ for (;;) { | |||
734 | } | 734 | } |
735 | else { | 735 | else { |
736 | skb_put(skb,pkt_len); /* Make room */ | 736 | skb_put(skb,pkt_len); /* Make room */ |
737 | eth_copy_and_sum(skb, | 737 | skb_copy_to_linear_data(skb, |
738 | (unsigned char *)__va(bdp->cbd_bufaddr), | 738 | (unsigned char *)__va(bdp->cbd_bufaddr), |
739 | pkt_len, 0); | 739 | pkt_len); |
740 | skb->protocol=eth_type_trans(skb,dev); | 740 | skb->protocol=eth_type_trans(skb,dev); |
741 | netif_rx(skb); | 741 | netif_rx(skb); |
742 | } | 742 | } |
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c index e58288e14369..703d47eee436 100644 --- a/arch/ppc/8xx_io/enet.c +++ b/arch/ppc/8xx_io/enet.c | |||
@@ -506,9 +506,9 @@ for (;;) { | |||
506 | } | 506 | } |
507 | else { | 507 | else { |
508 | skb_put(skb,pkt_len-4); /* Make room */ | 508 | skb_put(skb,pkt_len-4); /* Make room */ |
509 | eth_copy_and_sum(skb, | 509 | skb_copy_to_linear_data(skb, |
510 | cep->rx_vaddr[bdp - cep->rx_bd_base], | 510 | cep->rx_vaddr[bdp - cep->rx_bd_base], |
511 | pkt_len-4, 0); | 511 | pkt_len-4); |
512 | skb->protocol=eth_type_trans(skb,dev); | 512 | skb->protocol=eth_type_trans(skb,dev); |
513 | netif_rx(skb); | 513 | netif_rx(skb); |
514 | } | 514 | } |
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index d38335d2d710..0288279be9aa 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
@@ -725,7 +725,7 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) { | |||
725 | fep->stats.rx_dropped++; | 725 | fep->stats.rx_dropped++; |
726 | } else { | 726 | } else { |
727 | skb_put(skb,pkt_len-4); /* Make room */ | 727 | skb_put(skb,pkt_len-4); /* Make room */ |
728 | eth_copy_and_sum(skb, data, pkt_len-4, 0); | 728 | skb_copy_to_linear_data(skb, data, pkt_len-4); |
729 | skb->protocol=eth_type_trans(skb,dev); | 729 | skb->protocol=eth_type_trans(skb,dev); |
730 | netif_rx(skb); | 730 | netif_rx(skb); |
731 | } | 731 | } |