Re: [PATCH v5 3/5] netdev: ethernet dev_alloc_skb to netdev_alloc_skb
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: 2012-02-07 20:04:11
Also in:
linux-next, lkml
On Sun, Feb 5, 2012 at 13:50, Pradeep A. Dalvi [off-list ref] wrote:
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c index 26e25d7..0452e296 100644 --- a/drivers/net/ethernet/natsemi/sonic.c +++ b/drivers/net/ethernet/natsemi/sonic.c@@ -51,7 +51,7 @@ static int sonic_open(struct net_device *dev)printk("sonic_open: initializing sonic driver.\n"); for (i = 0; i < SONIC_NUM_RRS; i++) { - struct sk_buff *skb = dev_alloc_skb(SONIC_RBSIZE + 2); + struct sk_buff *skb = netdev_alloc_skb(dev, SONIC_RBSIZE + 2); if (skb == NULL) { while(i > 0) { /* free any that were allocated successfully */ i--;@@ -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 = dev_alloc_skb(SONIC_RBSIZE + 2); + new_skb = netdev_alloc_skb(SONIC_RBSIZE + 2);
drivers/net/ethernet/natsemi/sonic.c:425: error: too few arguments to function 'netdev_alloc_skb' cfr. m68k/defconfig http://kisskb.ellerman.id.au/kisskb/buildresult/5583743/ Your search-and-replace script (hmm, you haven't used a script, have you?) forgot to add the first "dev" parameter.
if (new_skb == NULL) {
printk(KERN_ERR "%s: Memory squeeze, dropping packet.\n", dev->name);
lp->stats.rx_dropped++;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds