aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdrivers/net/qla3xxx.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 9fbb871f2f69..77fc77ff1505 100755
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -287,9 +287,10 @@ static void ql_release_to_lrg_buf_free_list(struct ql3_adapter *qdev,
287 } 287 }
288 288
289 if (!lrg_buf_cb->skb) { 289 if (!lrg_buf_cb->skb) {
290 lrg_buf_cb->skb = dev_alloc_skb(qdev->lrg_buffer_len); 290 lrg_buf_cb->skb = netdev_alloc_skb(qdev->ndev,
291 qdev->lrg_buffer_len);
291 if (unlikely(!lrg_buf_cb->skb)) { 292 if (unlikely(!lrg_buf_cb->skb)) {
292 printk(KERN_ERR PFX "%s: failed dev_alloc_skb().\n", 293 printk(KERN_ERR PFX "%s: failed netdev_alloc_skb().\n",
293 qdev->ndev->name); 294 qdev->ndev->name);
294 qdev->lrg_buf_skb_check++; 295 qdev->lrg_buf_skb_check++;
295 } else { 296 } else {
@@ -1619,10 +1620,11 @@ static int ql_populate_free_queue(struct ql3_adapter *qdev)
1619 1620
1620 while (lrg_buf_cb) { 1621 while (lrg_buf_cb) {
1621 if (!lrg_buf_cb->skb) { 1622 if (!lrg_buf_cb->skb) {
1622 lrg_buf_cb->skb = dev_alloc_skb(qdev->lrg_buffer_len); 1623 lrg_buf_cb->skb = netdev_alloc_skb(qdev->ndev,
1624 qdev->lrg_buffer_len);
1623 if (unlikely(!lrg_buf_cb->skb)) { 1625 if (unlikely(!lrg_buf_cb->skb)) {
1624 printk(KERN_DEBUG PFX 1626 printk(KERN_DEBUG PFX
1625 "%s: Failed dev_alloc_skb().\n", 1627 "%s: Failed netdev_alloc_skb().\n",
1626 qdev->ndev->name); 1628 qdev->ndev->name);
1627 break; 1629 break;
1628 } else { 1630 } else {
@@ -2514,7 +2516,8 @@ static int ql_alloc_large_buffers(struct ql3_adapter *qdev)
2514 u64 map; 2516 u64 map;
2515 2517
2516 for (i = 0; i < NUM_LARGE_BUFFERS; i++) { 2518 for (i = 0; i < NUM_LARGE_BUFFERS; i++) {
2517 skb = dev_alloc_skb(qdev->lrg_buffer_len); 2519 skb = netdev_alloc_skb(qdev->ndev,
2520 qdev->lrg_buffer_len);
2518 if (unlikely(!skb)) { 2521 if (unlikely(!skb)) {
2519 /* Better luck next round */ 2522 /* Better luck next round */
2520 printk(KERN_ERR PFX 2523 printk(KERN_ERR PFX