diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-25 20:40:23 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:30 -0400 |
commit | 4c13eb6657fe9ef7b4dc8f1a405c902e9e5234e0 (patch) | |
tree | d338fad7a61824d8c14c079c0be437ea4ad83f01 /arch | |
parent | 029720f15dcd3c6c16824177cfc486083b229411 (diff) |
[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans
One less thing for drivers writers to worry about.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/hp/sim/simeth.c | 1 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/xpnet.c | 1 | ||||
-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 |
6 files changed, 0 insertions, 6 deletions
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c index 424e9257c9a0..edef008c2b42 100644 --- a/arch/ia64/hp/sim/simeth.c +++ b/arch/ia64/hp/sim/simeth.c | |||
@@ -427,7 +427,6 @@ make_new_skb(struct net_device *dev) | |||
427 | printk(KERN_NOTICE "%s: memory squeeze. dropping packet.\n", dev->name); | 427 | printk(KERN_NOTICE "%s: memory squeeze. dropping packet.\n", dev->name); |
428 | return NULL; | 428 | return NULL; |
429 | } | 429 | } |
430 | nskb->dev = dev; | ||
431 | 430 | ||
432 | skb_reserve(nskb, 2); /* Align IP on 16 byte boundaries */ | 431 | skb_reserve(nskb, 2); /* Align IP on 16 byte boundaries */ |
433 | 432 | ||
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c index c8173db0d84f..68d59d912c99 100644 --- a/arch/ia64/sn/kernel/xpnet.c +++ b/arch/ia64/sn/kernel/xpnet.c | |||
@@ -267,7 +267,6 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg) | |||
267 | (void *) skb->data, (void *) skb->tail, (void *) skb->end, | 267 | (void *) skb->data, (void *) skb->tail, (void *) skb->end, |
268 | skb->len); | 268 | skb->len); |
269 | 269 | ||
270 | skb->dev = xpnet_device; | ||
271 | skb->protocol = eth_type_trans(skb, xpnet_device); | 270 | skb->protocol = eth_type_trans(skb, xpnet_device); |
272 | skb->ip_summed = CHECKSUM_UNNECESSARY; | 271 | skb->ip_summed = CHECKSUM_UNNECESSARY; |
273 | 272 | ||
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); |