aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ti/davinci_emac.c
diff options
context:
space:
mode:
authorPradeep A. Dalvi <netdev@pradeepdalvi.com>2012-02-06 06:16:13 -0500
committerDavid S. Miller <davem@davemloft.net>2012-02-08 18:46:38 -0500
commitdae2e9f430c46c29e3f771110094bd3da3625aa4 (patch)
treeb78b2671d2566ea5795349e5dadf8ef786b507f5 /drivers/net/ethernet/ti/davinci_emac.c
parentc4062dfc425e94290ac427a98d6b4721dd2bc91f (diff)
netdev: ethernet dev_alloc_skb to netdev_alloc_skb
Replaced deprecating dev_alloc_skb with netdev_alloc_skb in drivers/net/ethernet - Removed extra skb->dev = dev after netdev_alloc_skb Signed-off-by: Pradeep A Dalvi <netdev@pradeepdalvi.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/davinci_emac.c')
-rw-r--r--drivers/net/ethernet/ti/davinci_emac.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 922a937e05cf..6b0659c59ddd 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -992,10 +992,9 @@ static irqreturn_t emac_irq(int irq, void *dev_id)
992 992
993static struct sk_buff *emac_rx_alloc(struct emac_priv *priv) 993static struct sk_buff *emac_rx_alloc(struct emac_priv *priv)
994{ 994{
995 struct sk_buff *skb = dev_alloc_skb(priv->rx_buf_size); 995 struct sk_buff *skb = netdev_alloc_skb(priv->ndev, priv->rx_buf_size);
996 if (WARN_ON(!skb)) 996 if (WARN_ON(!skb))
997 return NULL; 997 return NULL;
998 skb->dev = priv->ndev;
999 skb_reserve(skb, NET_IP_ALIGN); 998 skb_reserve(skb, NET_IP_ALIGN);
1000 return skb; 999 return skb;
1001} 1000}