diff --git a/[refs] b/[refs] index d7a3fa457a1c..5c705d017edf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af2ce213f6e6b28497c5c932f43b94026b5a0363 +refs/heads/master: 7280f5ae0d71f2259a42d1f7603480809e4867fb diff --git a/trunk/drivers/net/ethernet/natsemi/sonic.c b/trunk/drivers/net/ethernet/natsemi/sonic.c index 0452e2968d27..46795e403467 100644 --- a/trunk/drivers/net/ethernet/natsemi/sonic.c +++ b/trunk/drivers/net/ethernet/natsemi/sonic.c @@ -422,7 +422,7 @@ static void sonic_rx(struct net_device *dev) status = sonic_rda_get(dev, entry, SONIC_RD_STATUS); if (status & SONIC_RCR_PRX) { /* Malloc up new buffer. */ - new_skb = netdev_alloc_skb(SONIC_RBSIZE + 2); + new_skb = netdev_alloc_skb(dev, SONIC_RBSIZE + 2); if (new_skb == NULL) { printk(KERN_ERR "%s: Memory squeeze, dropping packet.\n", dev->name); lp->stats.rx_dropped++;