diff options
author | Pradeep A. Dalvi <netdev@pradeepdalvi.com> | 2012-02-06 06:16:13 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-08 18:46:38 -0500 |
commit | dae2e9f430c46c29e3f771110094bd3da3625aa4 (patch) | |
tree | b78b2671d2566ea5795349e5dadf8ef786b507f5 /drivers/net/ethernet/qlogic | |
parent | c4062dfc425e94290ac427a98d6b4721dd2bc91f (diff) |
netdev: ethernet dev_alloc_skb to netdev_alloc_skb
Replaced deprecating dev_alloc_skb with netdev_alloc_skb in drivers/net/ethernet
- Removed extra skb->dev = dev after netdev_alloc_skb
Signed-off-by: Pradeep A Dalvi <netdev@pradeepdalvi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index f69ac442c6a1..718b27440351 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | |||
@@ -1487,7 +1487,7 @@ netxen_alloc_rx_skb(struct netxen_adapter *adapter, | |||
1487 | dma_addr_t dma; | 1487 | dma_addr_t dma; |
1488 | struct pci_dev *pdev = adapter->pdev; | 1488 | struct pci_dev *pdev = adapter->pdev; |
1489 | 1489 | ||
1490 | buffer->skb = dev_alloc_skb(rds_ring->skb_size); | 1490 | buffer->skb = netdev_alloc_skb(adapter->netdev, rds_ring->skb_size); |
1491 | if (!buffer->skb) | 1491 | if (!buffer->skb) |
1492 | return 1; | 1492 | return 1; |
1493 | 1493 | ||
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c index 30dcbfba8f24..89ddf7f7d7df 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |||
@@ -719,7 +719,7 @@ static int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode) | |||
719 | int i, loop, cnt = 0; | 719 | int i, loop, cnt = 0; |
720 | 720 | ||
721 | for (i = 0; i < QLCNIC_NUM_ILB_PKT; i++) { | 721 | for (i = 0; i < QLCNIC_NUM_ILB_PKT; i++) { |
722 | skb = dev_alloc_skb(QLCNIC_ILB_PKT_SIZE); | 722 | skb = netdev_alloc_skb(adapter->netdev, QLCNIC_ILB_PKT_SIZE); |
723 | qlcnic_create_loopback_buff(skb->data, adapter->mac_addr); | 723 | qlcnic_create_loopback_buff(skb->data, adapter->mac_addr); |
724 | skb_put(skb, QLCNIC_ILB_PKT_SIZE); | 724 | skb_put(skb, QLCNIC_ILB_PKT_SIZE); |
725 | 725 | ||
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index 41d85efee422..d32cf0ddf1b9 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | |||
@@ -1440,7 +1440,7 @@ qlcnic_alloc_rx_skb(struct qlcnic_adapter *adapter, | |||
1440 | dma_addr_t dma; | 1440 | dma_addr_t dma; |
1441 | struct pci_dev *pdev = adapter->pdev; | 1441 | struct pci_dev *pdev = adapter->pdev; |
1442 | 1442 | ||
1443 | skb = dev_alloc_skb(rds_ring->skb_size); | 1443 | skb = netdev_alloc_skb(adapter->netdev, rds_ring->skb_size); |
1444 | if (!skb) { | 1444 | if (!skb) { |
1445 | adapter->stats.skb_alloc_failure++; | 1445 | adapter->stats.skb_alloc_failure++; |
1446 | return -ENOMEM; | 1446 | return -ENOMEM; |