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/ixp2000 | |
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/ixp2000')
-rw-r--r-- | drivers/net/ixp2000/ixpdev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index a4eccb11d677..6683afc02aaa 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c | |||
@@ -110,11 +110,10 @@ static int ixpdev_rx(struct net_device *dev, int *budget) | |||
110 | 110 | ||
111 | skb = dev_alloc_skb(desc->pkt_length + 2); | 111 | skb = dev_alloc_skb(desc->pkt_length + 2); |
112 | if (likely(skb != NULL)) { | 112 | if (likely(skb != NULL)) { |
113 | skb->dev = nds[desc->channel]; | ||
114 | skb_reserve(skb, 2); | 113 | skb_reserve(skb, 2); |
115 | eth_copy_and_sum(skb, buf, desc->pkt_length, 0); | 114 | eth_copy_and_sum(skb, buf, desc->pkt_length, 0); |
116 | skb_put(skb, desc->pkt_length); | 115 | skb_put(skb, desc->pkt_length); |
117 | skb->protocol = eth_type_trans(skb, skb->dev); | 116 | skb->protocol = eth_type_trans(skb, nds[desc->channel]); |
118 | 117 | ||
119 | skb->dev->last_rx = jiffies; | 118 | skb->dev->last_rx = jiffies; |
120 | 119 | ||