The patch titled
netpoll: fix retry memory leak
has been removed from the -mm tree. Its filename is
netpoll-retry-memory-leak.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: netpoll: fix retry memory leak
From: Stephen Hemminger <shemminger@xxxxxxxx>
If netpoll uses up its retries, it should drop the skb not leak memory.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/core/netpoll.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff -puN net/core/netpoll.c~netpoll-retry-memory-leak net/core/netpoll.c
--- a/net/core/netpoll.c~netpoll-retry-memory-leak
+++ a/net/core/netpoll.c
@@ -273,10 +273,8 @@ static void netpoll_send_skb(struct netp
int status;
struct netpoll_info *npinfo;
- if (!np || !np->dev || !netif_running(np->dev)) {
- __kfree_skb(skb);
- return;
- }
+ if (!np || !np->dev || !netif_running(np->dev))
+ goto free_skb;
npinfo = np->dev->npinfo;
@@ -314,6 +312,8 @@ static void netpoll_send_skb(struct netp
netpoll_poll(np);
udelay(50);
} while (npinfo->tries > 0);
+free_skb:
+ __kfree_skb(skb);
}
void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
_
Patches currently in -mm which might be from shemminger@xxxxxxxx are
origin.patch
git-netdev-all.patch
bonding-lockdep-annotation.patch
netpoll-retry-memory-leak.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
