|
@@ -108,14 +108,14 @@ static int ixpdev_rx(struct net_device *dev, int processed, int budget)
|
|
if (unlikely(!netif_running(nds[desc->channel])))
|
|
if (unlikely(!netif_running(nds[desc->channel])))
|
|
goto err;
|
|
goto err;
|
|
|
|
|
|
- skb = dev_alloc_skb(desc->pkt_length + 2);
|
|
|
|
|
|
+ skb = netdev_alloc_skb(dev, desc->pkt_length + 2);
|
|
if (likely(skb != NULL)) {
|
|
if (likely(skb != NULL)) {
|
|
skb_reserve(skb, 2);
|
|
skb_reserve(skb, 2);
|
|
skb_copy_to_linear_data(skb, buf, desc->pkt_length);
|
|
skb_copy_to_linear_data(skb, buf, desc->pkt_length);
|
|
skb_put(skb, desc->pkt_length);
|
|
skb_put(skb, desc->pkt_length);
|
|
skb->protocol = eth_type_trans(skb, nds[desc->channel]);
|
|
skb->protocol = eth_type_trans(skb, nds[desc->channel]);
|
|
|
|
|
|
- skb->dev->last_rx = jiffies;
|
|
|
|
|
|
+ dev->last_rx = jiffies;
|
|
|
|
|
|
netif_receive_skb(skb);
|
|
netif_receive_skb(skb);
|
|
}
|
|
}
|