aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/b44.c2
-rw-r--r--drivers/net/defxx.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 92aaaa1ee9f..2a51c757997 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -973,7 +973,7 @@ static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
973 ssb_dma_unmap_single(bp->sdev, mapping, len, 973 ssb_dma_unmap_single(bp->sdev, mapping, len,
974 DMA_TO_DEVICE); 974 DMA_TO_DEVICE);
975 975
976 bounce_skb = __dev_alloc_skb(len, GFP_ATOMIC | GFP_DMA); 976 bounce_skb = __netdev_alloc_skb(dev, len, GFP_ATOMIC | GFP_DMA);
977 if (!bounce_skb) 977 if (!bounce_skb)
978 goto err_out; 978 goto err_out;
979 979
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index 6445cedd586..4ec055dc717 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -2937,7 +2937,7 @@ static int dfx_rcv_init(DFX_board_t *bp, int get_buffers)
2937 for (i = 0; i < (int)(bp->rcv_bufs_to_post); i++) 2937 for (i = 0; i < (int)(bp->rcv_bufs_to_post); i++)
2938 for (j = 0; (i + j) < (int)PI_RCV_DATA_K_NUM_ENTRIES; j += bp->rcv_bufs_to_post) 2938 for (j = 0; (i + j) < (int)PI_RCV_DATA_K_NUM_ENTRIES; j += bp->rcv_bufs_to_post)
2939 { 2939 {
2940 struct sk_buff *newskb = __dev_alloc_skb(NEW_SKB_SIZE, GFP_NOIO); 2940 struct sk_buff *newskb = __netdev_alloc_skb(bp->dev, NEW_SKB_SIZE, GFP_NOIO);
2941 if (!newskb) 2941 if (!newskb)
2942 return -ENOMEM; 2942 return -ENOMEM;
2943 bp->descr_block_virt->rcv_data[i+j].long_0 = (u32) (PI_RCV_DESCR_M_SOP | 2943 bp->descr_block_virt->rcv_data[i+j].long_0 = (u32) (PI_RCV_DESCR_M_SOP |