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/fs_enet | |
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/fs_enet')
-rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 4a05c14bf7ec..9f6ef315ce51 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -170,7 +170,6 @@ static int fs_enet_rx_napi(struct net_device *dev, int *budget) | |||
170 | skbn = dev_alloc_skb(ENET_RX_FRSIZE); | 170 | skbn = dev_alloc_skb(ENET_RX_FRSIZE); |
171 | 171 | ||
172 | if (skbn != NULL) { | 172 | if (skbn != NULL) { |
173 | skb->dev = dev; | ||
174 | skb_put(skb, pkt_len); /* Make room */ | 173 | skb_put(skb, pkt_len); /* Make room */ |
175 | skb->protocol = eth_type_trans(skb, dev); | 174 | skb->protocol = eth_type_trans(skb, dev); |
176 | received++; | 175 | received++; |
@@ -304,7 +303,6 @@ static int fs_enet_rx_non_napi(struct net_device *dev) | |||
304 | skbn = dev_alloc_skb(ENET_RX_FRSIZE); | 303 | skbn = dev_alloc_skb(ENET_RX_FRSIZE); |
305 | 304 | ||
306 | if (skbn != NULL) { | 305 | if (skbn != NULL) { |
307 | skb->dev = dev; | ||
308 | skb_put(skb, pkt_len); /* Make room */ | 306 | skb_put(skb, pkt_len); /* Make room */ |
309 | skb->protocol = eth_type_trans(skb, dev); | 307 | skb->protocol = eth_type_trans(skb, dev); |
310 | received++; | 308 | received++; |
@@ -516,7 +514,6 @@ void fs_init_bds(struct net_device *dev) | |||
516 | break; | 514 | break; |
517 | } | 515 | } |
518 | fep->rx_skbuff[i] = skb; | 516 | fep->rx_skbuff[i] = skb; |
519 | skb->dev = dev; | ||
520 | CBDW_BUFADDR(bdp, | 517 | CBDW_BUFADDR(bdp, |
521 | dma_map_single(fep->dev, skb->data, | 518 | dma_map_single(fep->dev, skb->data, |
522 | L1_CACHE_ALIGN(PKT_MAXBUF_SIZE), | 519 | L1_CACHE_ALIGN(PKT_MAXBUF_SIZE), |