* Re: [PATCH v5 3/5] netdev: ethernet dev_alloc_skb to netdev_alloc_skb
[not found] ` <ef62da964e8660dfdf2a25cd643631bb15914ecf.1328445742.git.netdev@pradeepdalvi.com>
@ 2012-02-07 20:04 ` Geert Uytterhoeven
2012-02-07 20:29 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2012-02-07 20:04 UTC (permalink / raw)
To: Pradeep A. Dalvi; +Cc: netdev, David S. Miller, linux-kernel, Linux-Next
On Sun, Feb 5, 2012 at 13:50, Pradeep A. Dalvi <netdev@pradeepdalvi.com> wrote:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v5 3/5] netdev: ethernet dev_alloc_skb to netdev_alloc_skb
2012-02-07 20:04 ` [PATCH v5 3/5] netdev: ethernet dev_alloc_skb to netdev_alloc_skb Geert Uytterhoeven
@ 2012-02-07 20:29 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-02-07 20:29 UTC (permalink / raw)
To: geert; +Cc: netdev, netdev, linux-kernel, linux-next
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 7 Feb 2012 21:04:07 +0100
> drivers/net/ethernet/natsemi/sonic.c:425: error: too few arguments to
> function 'netdev_alloc_skb'
I just wrote and committed the following fix, which took less effort
than your report most likely :-)
--------------------
sonice: Fix build due to botched netdev_alloc_skb() conversion.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/natsemi/sonic.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c
index 0452e296..46795e4 100644
--- a/drivers/net/ethernet/natsemi/sonic.c
+++ b/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++;
--
1.7.7.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-07 20:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <cf736034e7bd407297e2ea9fbf247fb410eb7b39.1328445742.git.netdev@pradeepdalvi.com>
[not found] ` <ef62da964e8660dfdf2a25cd643631bb15914ecf.1328445742.git.netdev@pradeepdalvi.com>
2012-02-07 20:04 ` [PATCH v5 3/5] netdev: ethernet dev_alloc_skb to netdev_alloc_skb Geert Uytterhoeven
2012-02-07 20:29 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).