aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/dec/tulip/de2104x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/dec/tulip/de2104x.c')
-rw-r--r--drivers/net/ethernet/dec/tulip/de2104x.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 1eb46a0bb488..68f1c39184df 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -439,7 +439,7 @@ static void de_rx (struct de_private *de)
439 rx_tail, status, len, copying_skb); 439 rx_tail, status, len, copying_skb);
440 440
441 buflen = copying_skb ? (len + RX_OFFSET) : de->rx_buf_sz; 441 buflen = copying_skb ? (len + RX_OFFSET) : de->rx_buf_sz;
442 copy_skb = dev_alloc_skb (buflen); 442 copy_skb = netdev_alloc_skb(de->dev, buflen);
443 if (unlikely(!copy_skb)) { 443 if (unlikely(!copy_skb)) {
444 de->net_stats.rx_dropped++; 444 de->net_stats.rx_dropped++;
445 drop = 1; 445 drop = 1;
@@ -1283,12 +1283,10 @@ static int de_refill_rx (struct de_private *de)
1283 for (i = 0; i < DE_RX_RING_SIZE; i++) { 1283 for (i = 0; i < DE_RX_RING_SIZE; i++) {
1284 struct sk_buff *skb; 1284 struct sk_buff *skb;
1285 1285
1286 skb = dev_alloc_skb(de->rx_buf_sz); 1286 skb = netdev_alloc_skb(de->dev, de->rx_buf_sz);
1287 if (!skb) 1287 if (!skb)
1288 goto err_out; 1288 goto err_out;
1289 1289
1290 skb->dev = de->dev;
1291
1292 de->rx_skb[i].mapping = pci_map_single(de->pdev, 1290 de->rx_skb[i].mapping = pci_map_single(de->pdev,
1293 skb->data, de->rx_buf_sz, PCI_DMA_FROMDEVICE); 1291 skb->data, de->rx_buf_sz, PCI_DMA_FROMDEVICE);
1294 de->rx_skb[i].skb = skb; 1292 de->rx_skb[i].skb = skb;