Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9034f77b authored by David S. Miller's avatar David S. Miller
Browse files

netdev: Use __netdev_alloc_skb() instead of __dev_alloc_skb(). 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 149490f1

drivers/net/b44.c

+1 −1
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev) 
			ssb_dma_unmap_single(bp->sdev, mapping, len,

					     DMA_TO_DEVICE);



		bounce_skb = __dev_alloc_skb(len, GFP_ATOMIC | GFP_DMA);

		bounce_skb = __netdev_alloc_skb(dev, len, GFP_ATOMIC | GFP_DMA);

		if (!bounce_skb)

			goto err_out;

drivers/net/defxx.c

+1 −1
Original line number Diff line number Diff line
@@ -2937,7 +2937,7 @@ static int dfx_rcv_init(DFX_board_t *bp, int get_buffers) 
	for (i = 0; i < (int)(bp->rcv_bufs_to_post); i++)

		for (j = 0; (i + j) < (int)PI_RCV_DATA_K_NUM_ENTRIES; j += bp->rcv_bufs_to_post)

		{

			struct sk_buff *newskb = __dev_alloc_skb(NEW_SKB_SIZE, GFP_NOIO);

			struct sk_buff *newskb = __netdev_alloc_skb(bp->dev, NEW_SKB_SIZE, GFP_NOIO);

			if (!newskb)

				return -ENOMEM;

			bp->descr_block_virt->rcv_data[i+j].long_0 = (u32) (PI_RCV_DESCR_M_SOP |