Commit 47f98c7d authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik

dl2k: use netdev_alloc_skb

Use netdev_alloc_skb. This sets skb->dev and allows arch specific
allocation.
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 8eb60131
...@@ -499,7 +499,7 @@ rio_timer (unsigned long data) ...@@ -499,7 +499,7 @@ rio_timer (unsigned long data)
entry = np->old_rx % RX_RING_SIZE; entry = np->old_rx % RX_RING_SIZE;
/* Dropped packets don't need to re-allocate */ /* Dropped packets don't need to re-allocate */
if (np->rx_skbuff[entry] == NULL) { if (np->rx_skbuff[entry] == NULL) {
skb = dev_alloc_skb (np->rx_buf_sz); skb = netdev_alloc_skb (dev, np->rx_buf_sz);
if (skb == NULL) { if (skb == NULL) {
np->rx_ring[entry].fraginfo = 0; np->rx_ring[entry].fraginfo = 0;
printk (KERN_INFO printk (KERN_INFO
...@@ -570,7 +570,7 @@ alloc_list (struct net_device *dev) ...@@ -570,7 +570,7 @@ alloc_list (struct net_device *dev)
/* Allocate the rx buffers */ /* Allocate the rx buffers */
for (i = 0; i < RX_RING_SIZE; i++) { for (i = 0; i < RX_RING_SIZE; i++) {
/* Allocated fixed size of skbuff */ /* Allocated fixed size of skbuff */
struct sk_buff *skb = dev_alloc_skb (np->rx_buf_sz); struct sk_buff *skb = netdev_alloc_skb (dev, np->rx_buf_sz);
np->rx_skbuff[i] = skb; np->rx_skbuff[i] = skb;
if (skb == NULL) { if (skb == NULL) {
printk (KERN_ERR printk (KERN_ERR
...@@ -867,7 +867,7 @@ receive_packet (struct net_device *dev) ...@@ -867,7 +867,7 @@ receive_packet (struct net_device *dev)
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
skb_put (skb = np->rx_skbuff[entry], pkt_len); skb_put (skb = np->rx_skbuff[entry], pkt_len);
np->rx_skbuff[entry] = NULL; np->rx_skbuff[entry] = NULL;
} else if ((skb = dev_alloc_skb (pkt_len + 2)) != NULL) { } else if ((skb = netdev_alloc_skb(dev, pkt_len + 2))) {
pci_dma_sync_single_for_cpu(np->pdev, pci_dma_sync_single_for_cpu(np->pdev,
desc_to_dma(desc), desc_to_dma(desc),
np->rx_buf_sz, np->rx_buf_sz,
...@@ -904,7 +904,7 @@ receive_packet (struct net_device *dev) ...@@ -904,7 +904,7 @@ receive_packet (struct net_device *dev)
struct sk_buff *skb; struct sk_buff *skb;
/* Dropped packets don't need to re-allocate */ /* Dropped packets don't need to re-allocate */
if (np->rx_skbuff[entry] == NULL) { if (np->rx_skbuff[entry] == NULL) {
skb = dev_alloc_skb (np->rx_buf_sz); skb = netdev_alloc_skb(dev, np->rx_buf_sz);
if (skb == NULL) { if (skb == NULL) {
np->rx_ring[entry].fraginfo = 0; np->rx_ring[entry].fraginfo = 0;
printk (KERN_INFO printk (KERN_INFO
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment