aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixp2000
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-25 17:40:23 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:24:30 -0700
commit4c13eb6657fe9ef7b4dc8f1a405c902e9e5234e0 (patch)
treed338fad7a61824d8c14c079c0be437ea4ad83f01 /drivers/net/ixp2000
parent[AOE]: Introduce aoe_hdr() (diff)
downloadlinux-dev-4c13eb6657fe9ef7b4dc8f1a405c902e9e5234e0.tar.xz
linux-dev-4c13eb6657fe9ef7b4dc8f1a405c902e9e5234e0.zip
[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.c3
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)
skb = dev_alloc_skb(desc->pkt_length + 2);
if (likely(skb != NULL)) {
- skb->dev = nds[desc->channel];
skb_reserve(skb, 2);
eth_copy_and_sum(skb, buf, desc->pkt_length, 0);
skb_put(skb, desc->pkt_length);
- skb->protocol = eth_type_trans(skb, skb->dev);
+ skb->protocol = eth_type_trans(skb, nds[desc->channel]);
skb->dev->last_rx = jiffies;