Skip to content

Commit cd238fa

Browse files
Benjamin LiJeff Garzik
authored andcommitted
qla3xxx: Changed to use netdev_alloc_skb() from dev_alloc_skb
Signed-off-by: Benjamin Li <benjamin.li@qlogic.com> Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
1 parent d2d76b8 commit cd238fa

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

drivers/net/qla3xxx.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,10 @@ static void ql_release_to_lrg_buf_free_list(struct ql3_adapter *qdev,
287287
}
288288

289289
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);
291292
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",
293294
qdev->ndev->name);
294295
qdev->lrg_buf_skb_check++;
295296
} else {
@@ -1619,10 +1620,11 @@ static int ql_populate_free_queue(struct ql3_adapter *qdev)
16191620

16201621
while (lrg_buf_cb) {
16211622
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);
16231625
if (unlikely(!lrg_buf_cb->skb)) {
16241626
printk(KERN_DEBUG PFX
1625-
"%s: Failed dev_alloc_skb().\n",
1627+
"%s: Failed netdev_alloc_skb().\n",
16261628
qdev->ndev->name);
16271629
break;
16281630
} else {
@@ -2514,7 +2516,8 @@ static int ql_alloc_large_buffers(struct ql3_adapter *qdev)
25142516
u64 map;
25152517

25162518
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);
25182521
if (unlikely(!skb)) {
25192522
/* Better luck next round */
25202523
printk(KERN_ERR PFX

0 commit comments

Comments
 (0)