diff --git a/[refs] b/[refs] index eb2a25a7b91b..08691b649a9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26a17b7bbb36a8552d531bc1ad08472fb5aa3007 +refs/heads/master: 2723b019214c8787ee2fb54dacacfd112d2e5bf4 diff --git a/trunk/drivers/net/sc92031.c b/trunk/drivers/net/sc92031.c index 841bfa745301..f64a860029b7 100644 --- a/trunk/drivers/net/sc92031.c +++ b/trunk/drivers/net/sc92031.c @@ -796,7 +796,7 @@ static void _sc92031_rx_tasklet(struct net_device *dev) rx_len -= rx_size_align + 4; - skb = dev_alloc_skb(pkt_size + NET_IP_ALIGN); + skb = netdev_alloc_skb(dev, pkt_size + NET_IP_ALIGN); if (unlikely(!skb)) { if (printk_ratelimit()) printk(KERN_ERR "%s: Couldn't allocate a skb_buff for a packet of size %u\n",