From e7db45cce8e74603bdcecbe2574b959865f3166a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 16 Apr 2008 16:37:37 -0700 Subject: [PATCH] --- yaml --- r: 102647 b: refs/heads/master c: d27e7c3f6c82297611d1e1ee9476a2f31b3e89df h: refs/heads/master i: 102645: fc1a86d3f59a6575bae764efb2daf51498333403 102643: 241cc053aa06cbbadd85675a8d403d25184a1c3c 102639: 4ec99d5e2091e58a4e5caef6b86ad2d6d75c15f9 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixp2000/ixpdev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e557a135e3fd..90f0f87f295a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f7a3535a6805870f265f39c92c24b136cb967f4 +refs/heads/master: d27e7c3f6c82297611d1e1ee9476a2f31b3e89df diff --git a/trunk/drivers/net/ixp2000/ixpdev.c b/trunk/drivers/net/ixp2000/ixpdev.c index 484cb2ba717f..7111c65f0b30 100644 --- a/trunk/drivers/net/ixp2000/ixpdev.c +++ b/trunk/drivers/net/ixp2000/ixpdev.c @@ -108,14 +108,14 @@ static int ixpdev_rx(struct net_device *dev, int processed, int budget) if (unlikely(!netif_running(nds[desc->channel]))) goto err; - skb = dev_alloc_skb(desc->pkt_length + 2); + skb = netdev_alloc_skb(dev, desc->pkt_length + 2); if (likely(skb != NULL)) { skb_reserve(skb, 2); skb_copy_to_linear_data(skb, buf, desc->pkt_length); skb_put(skb, desc->pkt_length); skb->protocol = eth_type_trans(skb, nds[desc->channel]); - skb->dev->last_rx = jiffies; + dev->last_rx = jiffies; netif_receive_skb(skb); }