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 /drivers/net/arm | |
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 'drivers/net/arm')
-rw-r--r-- | drivers/net/arm/am79c961a.c | 1 | ||||
-rw-r--r-- | drivers/net/arm/at91_ether.c | 1 | ||||
-rw-r--r-- | drivers/net/arm/ep93xx_eth.c | 1 | ||||
-rw-r--r-- | drivers/net/arm/ether1.c | 1 | ||||
-rw-r--r-- | drivers/net/arm/ether3.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c index ddd12d44ff2..8f0d7ce503c 100644 --- a/drivers/net/arm/am79c961a.c +++ b/drivers/net/arm/am79c961a.c | |||
@@ -526,7 +526,6 @@ am79c961_rx(struct net_device *dev, struct dev_priv *priv) | |||
526 | skb = dev_alloc_skb(len + 2); | 526 | skb = dev_alloc_skb(len + 2); |
527 | 527 | ||
528 | if (skb) { | 528 | if (skb) { |
529 | skb->dev = dev; | ||
530 | skb_reserve(skb, 2); | 529 | skb_reserve(skb, 2); |
531 | 530 | ||
532 | am_readbuffer(dev, pktaddr, skb_put(skb, len), len); | 531 | am_readbuffer(dev, pktaddr, skb_put(skb, len), len); |
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c index 1621b8fe35c..152fa7a042b 100644 --- a/drivers/net/arm/at91_ether.c +++ b/drivers/net/arm/at91_ether.c | |||
@@ -858,7 +858,6 @@ static void at91ether_rx(struct net_device *dev) | |||
858 | skb_reserve(skb, 2); | 858 | skb_reserve(skb, 2); |
859 | memcpy(skb_put(skb, pktlen), p_recv, pktlen); | 859 | memcpy(skb_put(skb, pktlen), p_recv, pktlen); |
860 | 860 | ||
861 | skb->dev = dev; | ||
862 | skb->protocol = eth_type_trans(skb, dev); | 861 | skb->protocol = eth_type_trans(skb, dev); |
863 | dev->last_rx = jiffies; | 862 | dev->last_rx = jiffies; |
864 | lp->stats.rx_bytes += pktlen; | 863 | lp->stats.rx_bytes += pktlen; |
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index dd698b033a6..2438c5bff23 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c | |||
@@ -255,7 +255,6 @@ static int ep93xx_rx(struct net_device *dev, int *budget) | |||
255 | 255 | ||
256 | skb = dev_alloc_skb(length + 2); | 256 | skb = dev_alloc_skb(length + 2); |
257 | if (likely(skb != NULL)) { | 257 | if (likely(skb != NULL)) { |
258 | skb->dev = dev; | ||
259 | skb_reserve(skb, 2); | 258 | skb_reserve(skb, 2); |
260 | dma_sync_single(NULL, ep->descs->rdesc[entry].buf_addr, | 259 | dma_sync_single(NULL, ep->descs->rdesc[entry].buf_addr, |
261 | length, DMA_FROM_DEVICE); | 260 | length, DMA_FROM_DEVICE); |
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c index a2921882eba..f075cebe84a 100644 --- a/drivers/net/arm/ether1.c +++ b/drivers/net/arm/ether1.c | |||
@@ -875,7 +875,6 @@ ether1_recv_done (struct net_device *dev) | |||
875 | skb = dev_alloc_skb (length + 2); | 875 | skb = dev_alloc_skb (length + 2); |
876 | 876 | ||
877 | if (skb) { | 877 | if (skb) { |
878 | skb->dev = dev; | ||
879 | skb_reserve (skb, 2); | 878 | skb_reserve (skb, 2); |
880 | 879 | ||
881 | ether1_readbuffer (dev, skb_put (skb, length), rbd.rbd_bufl, length); | 880 | ether1_readbuffer (dev, skb_put (skb, length), rbd.rbd_bufl, length); |
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c index 841178343a0..32da2eb9bce 100644 --- a/drivers/net/arm/ether3.c +++ b/drivers/net/arm/ether3.c | |||
@@ -661,7 +661,6 @@ if (next_ptr < RX_START || next_ptr >= RX_END) { | |||
661 | if (skb) { | 661 | if (skb) { |
662 | unsigned char *buf; | 662 | unsigned char *buf; |
663 | 663 | ||
664 | skb->dev = dev; | ||
665 | skb_reserve(skb, 2); | 664 | skb_reserve(skb, 2); |
666 | buf = skb_put(skb, length); | 665 | buf = skb_put(skb, length); |
667 | ether3_readbuffer(dev, buf + 12, length - 12); | 666 | ether3_readbuffer(dev, buf + 12, length - 12); |