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

Commit d19e22dc authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

enic: use netdev_alloc_skb 



Use netdev_alloc_skb rather than dev_alloc_skb

Signed-off-by: default avatarScott Feldman <scofeldm@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea0d7d91

drivers/net/enic/enic_main.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -869,11 +869,12 @@ static void enic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf) 
	dev_kfree_skb_any(buf->os_buf);

	dev_kfree_skb_any(buf->os_buf);

}

}





static inline struct sk_buff *enic_rq_alloc_skb(unsigned int size)

static inline struct sk_buff *enic_rq_alloc_skb(struct net_device *netdev,

	unsigned int size)

{

{

	struct sk_buff *skb;

	struct sk_buff *skb;





	skb = dev_alloc_skb(size + NET_IP_ALIGN);

	skb = netdev_alloc_skb(netdev, size + NET_IP_ALIGN);





	if (skb)

	if (skb)

		skb_reserve(skb, NET_IP_ALIGN);

		skb_reserve(skb, NET_IP_ALIGN);
@@ -884,12 +885,13 @@ static inline struct sk_buff *enic_rq_alloc_skb(unsigned int size) 
static int enic_rq_alloc_buf(struct vnic_rq *rq)

static int enic_rq_alloc_buf(struct vnic_rq *rq)

{

{

	struct enic *enic = vnic_dev_priv(rq->vdev);

	struct enic *enic = vnic_dev_priv(rq->vdev);

	struct net_device *netdev = enic->netdev;

	struct sk_buff *skb;

	struct sk_buff *skb;

	unsigned int len = enic->netdev->mtu + ETH_HLEN;

	unsigned int len = netdev->mtu + ETH_HLEN;

	unsigned int os_buf_index = 0;

	unsigned int os_buf_index = 0;

	dma_addr_t dma_addr;

	dma_addr_t dma_addr;





	skb = enic_rq_alloc_skb(len);

	skb = enic_rq_alloc_skb(netdev, len);

	if (!skb)

	if (!skb)

		return -ENOMEM;

		return -ENOMEM;