aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/enic/enic_main.c
diff options
context:
space:
mode:
authorScott Feldman <scofeldm@cisco.com>2009-09-03 13:02:08 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-03 23:19:12 -0400
commitd19e22dc2c1c43724c1d9ce4a5456ae74eeb6da8 (patch)
tree4dec2301d6ca6d17ea3a4c6864d0d660825a964a /drivers/net/enic/enic_main.c
parentea0d7d9181b0831f1b570b02fa02a15f25520c12 (diff)
enic: use netdev_alloc_skb
Use netdev_alloc_skb rather than dev_alloc_skb Signed-off-by: Scott Feldman <scofeldm@cisco.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/enic/enic_main.c')
-rw-r--r--drivers/net/enic/enic_main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index bc5cb225ddac..73f01075287d 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -869,11 +869,12 @@ static void enic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)
869 dev_kfree_skb_any(buf->os_buf); 869 dev_kfree_skb_any(buf->os_buf);
870} 870}
871 871
872static inline struct sk_buff *enic_rq_alloc_skb(unsigned int size) 872static inline struct sk_buff *enic_rq_alloc_skb(struct net_device *netdev,
873 unsigned int size)
873{ 874{
874 struct sk_buff *skb; 875 struct sk_buff *skb;
875 876
876 skb = dev_alloc_skb(size + NET_IP_ALIGN); 877 skb = netdev_alloc_skb(netdev, size + NET_IP_ALIGN);
877 878
878 if (skb) 879 if (skb)
879 skb_reserve(skb, NET_IP_ALIGN); 880 skb_reserve(skb, NET_IP_ALIGN);
@@ -884,12 +885,13 @@ static inline struct sk_buff *enic_rq_alloc_skb(unsigned int size)
884static int enic_rq_alloc_buf(struct vnic_rq *rq) 885static int enic_rq_alloc_buf(struct vnic_rq *rq)
885{ 886{
886 struct enic *enic = vnic_dev_priv(rq->vdev); 887 struct enic *enic = vnic_dev_priv(rq->vdev);
888 struct net_device *netdev = enic->netdev;
887 struct sk_buff *skb; 889 struct sk_buff *skb;
888 unsigned int len = enic->netdev->mtu + ETH_HLEN; 890 unsigned int len = netdev->mtu + ETH_HLEN;
889 unsigned int os_buf_index = 0; 891 unsigned int os_buf_index = 0;
890 dma_addr_t dma_addr; 892 dma_addr_t dma_addr;
891 893
892 skb = enic_rq_alloc_skb(len); 894 skb = enic_rq_alloc_skb(netdev, len);
893 if (!skb) 895 if (!skb)
894 return -ENOMEM; 896 return -ENOMEM;
895 897