[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1337412701.7029.79.camel@edumazet-glaptop>
Date: Sat, 19 May 2012 09:31:41 +0200
From: Eric Dumazet <eric.dumazet@...il.com>
To: David Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org, mcarlson@...adcom.com, mchan@...adcom.com
Subject: Re: [PATCH net-next] tg3: use netdev_alloc_frag() API
On Sat, 2012-05-19 at 03:19 -0400, David Miller wrote:
> From: Eric Dumazet <eric.dumazet@...il.com>
> Date: Sat, 19 May 2012 09:15:49 +0200
>
> > From: Eric Dumazet <edumazet@...gle.com>
> >
> > Update our reference driver to use netdev_alloc_frag() API instead of
> > the temporary custom allocator I introduced in commit 8d4057a938
> > (tg3: provide frags as skb head)
> >
> > This removes the memory leak we had, since we could leak one page at
> > device dismantle.
> >
> > Signed-off-by: Eric Dumazet <edumazet@...gle.com>
>
> Hmmm, doesn't apply cleanly to net-next for some reason:
>
> [davem@drr net-next]$ git am --signoff net-next-tg3-use-netdev_alloc_frag-API.patch
> Applying: tg3: use netdev_alloc_frag() API
> error: patch failed: drivers/net/ethernet/broadcom/tg3.c:5631
> error: drivers/net/ethernet/broadcom/tg3.c: patch does not apply
> Patch failed at 0001 tg3: use netdev_alloc_frag() API
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
Indeed, there is an extra space at the end of one line in my tree... ???
atomic_add((PAGE_SIZE / TG3_FRAGSIZE) - 1, &page->_count); <HERE>
I submit a v2 immediately.
Sorry
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists