diff options
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/8260_io/enet.c | 1 | ||||
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 1 | ||||
-rw-r--r-- | arch/ppc/8xx_io/enet.c | 1 | ||||
-rw-r--r-- | arch/ppc/8xx_io/fec.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c index a6056c29cf00..48ce84f5be93 100644 --- a/arch/ppc/8260_io/enet.c +++ b/arch/ppc/8260_io/enet.c | |||
@@ -477,7 +477,6 @@ for (;;) { | |||
477 | cep->stats.rx_dropped++; | 477 | cep->stats.rx_dropped++; |
478 | } | 478 | } |
479 | else { | 479 | else { |
480 | skb->dev = dev; | ||
481 | skb_put(skb,pkt_len-4); /* Make room */ | 480 | skb_put(skb,pkt_len-4); /* Make room */ |
482 | eth_copy_and_sum(skb, | 481 | eth_copy_and_sum(skb, |
483 | (unsigned char *)__va(bdp->cbd_bufaddr), | 482 | (unsigned char *)__va(bdp->cbd_bufaddr), |
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index 06b84c372e58..9db825fe37f0 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -734,7 +734,6 @@ for (;;) { | |||
734 | cep->stats.rx_dropped++; | 734 | cep->stats.rx_dropped++; |
735 | } | 735 | } |
736 | else { | 736 | else { |
737 | skb->dev = dev; | ||
738 | skb_put(skb,pkt_len); /* Make room */ | 737 | skb_put(skb,pkt_len); /* Make room */ |
739 | eth_copy_and_sum(skb, | 738 | eth_copy_and_sum(skb, |
740 | (unsigned char *)__va(bdp->cbd_bufaddr), | 739 | (unsigned char *)__va(bdp->cbd_bufaddr), |
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c index b23c45bc151a..bfa3f52996d1 100644 --- a/arch/ppc/8xx_io/enet.c +++ b/arch/ppc/8xx_io/enet.c | |||
@@ -506,7 +506,6 @@ for (;;) { | |||
506 | cep->stats.rx_dropped++; | 506 | cep->stats.rx_dropped++; |
507 | } | 507 | } |
508 | else { | 508 | else { |
509 | skb->dev = dev; | ||
510 | skb_put(skb,pkt_len-4); /* Make room */ | 509 | skb_put(skb,pkt_len-4); /* Make room */ |
511 | eth_copy_and_sum(skb, | 510 | eth_copy_and_sum(skb, |
512 | cep->rx_vaddr[bdp - cep->rx_bd_base], | 511 | cep->rx_vaddr[bdp - cep->rx_bd_base], |
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index e6c28fb423b2..57a9a61e54b5 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
@@ -724,7 +724,6 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) { | |||
724 | printk("%s: Memory squeeze, dropping packet.\n", dev->name); | 724 | printk("%s: Memory squeeze, dropping packet.\n", dev->name); |
725 | fep->stats.rx_dropped++; | 725 | fep->stats.rx_dropped++; |
726 | } else { | 726 | } else { |
727 | skb->dev = dev; | ||
728 | skb_put(skb,pkt_len-4); /* Make room */ | 727 | skb_put(skb,pkt_len-4); /* Make room */ |
729 | eth_copy_and_sum(skb, data, pkt_len-4, 0); | 728 | eth_copy_and_sum(skb, data, pkt_len-4, 0); |
730 | skb->protocol=eth_type_trans(skb,dev); | 729 | skb->protocol=eth_type_trans(skb,dev); |