Author: maks-guest
Date: Tue Oct 24 14:35:49 2006
New Revision: 7642
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/net-netpoll.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/4
Log:
add netpoll fix
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Tue Oct 24 14:35:49 2006
@@ -16,7 +16,10 @@
sys_msgrcv() and compat_sys_msgrcv(), triggered every 5 seconds whenever
fakeroot is running.
- -- Norbert Tretkowski <[EMAIL PROTECTED]> Sat, 21 Oct 2006 18:52:12 +0200
+ [ maximilian attems ]
+ * Add netpoll leak fix.
+
+ -- maximilian attems <[EMAIL PROTECTED]> Tue, 24 Oct 2006 16:29:06 +0200
linux-2.6 (2.6.18-3) unstable; urgency=low
Added: dists/trunk/linux-2.6/debian/patches/bugfix/net-netpoll.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/net-netpoll.patch Tue Oct
24 14:35:49 2006
@@ -0,0 +1,42 @@
+From [EMAIL PROTECTED] Wed Oct 18 23:31:05 2006
+From: Stephen Hemminger <[EMAIL PROTECTED]>
+
+If netpoll uses up it's retries, it should drop the skb
+not leak memory.
+
+Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
+---
+ net/core/netpoll.c | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/net/core/netpoll.c b/net/core/netpoll.c
+index ead5920..c375fde 100644
+--- a/net/core/netpoll.c
++++ b/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)
+--
+1.4.2.3
+
+
+
Modified: dists/trunk/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/4 (original)
+++ dists/trunk/linux-2.6/debian/patches/series/4 Tue Oct 24 14:35:49 2006
@@ -1,3 +1,4 @@
- sparc64-atyfb-xl-gr.patch
+ bugfix/sparc/sunblade-clock-hang.patch
+ bugfix/sparc/compat-alloc-user-space-alignment.patch
++ bugfix/net-netpoll.patch
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
