From: gregkh@suse.de Date: Thu, 10 Mar 2005 04:28:17 +0000 (-0800) Subject: [PATCH] cleaned up, and signed off on the ipv6 patch. X-Git-Tag: v2.6.11.9~71 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48f3c342fffc76e4455c17e2463c5ea7aaff9e9d;p=thirdparty%2Fkernel%2Fstable-queue.git [PATCH] cleaned up, and signed off on the ipv6 patch. --- diff --git a/ipv6-modular-build-fix.patch b/ipv6-modular-build-fix.patch index eb5286deb85..da0f6c50af0 100644 --- a/ipv6-modular-build-fix.patch +++ b/ipv6-modular-build-fix.patch @@ -1,9 +1,7 @@ Date: Wed, 9 Mar 2005 17:14:31 -0800 From: "David S. Miller" To: stable@kernel.org -Cc: -Subject: [PATCH] Fix busted TCP symbol export -Lines: 47 +Subject: [PATCH] [TCP]: Put back tcp_timer_bug_msg[] symbol export. This wrecks the ipv6 modular build for a lot of people. @@ -12,31 +10,15 @@ I never hit this. My best guess is that my compiler is optimizing the reference away, but that can never be depended upon and the symbol export really is needed. -Thanks. - -# This is a BitKeeper generated diff -Nru style patch. -# -# ChangeSet -# 2005/03/02 21:36:48-08:00 yoshfuji@linux-ipv6.org -# [TCP]: Put back tcp_timer_bug_msg[] symbol export. -# -# It is needed for tcp_reset_xmit_timer(), which is invoked by -# tcp_prequeue() which is invoked from tcp_ipv6.c -# -# Signed-off-by: Hideaki YOSHIFUJI -# Signed-off-by: David S. Miller -# -# net/ipv4/tcp_timer.c -# 2005/03/02 21:36:38-08:00 yoshfuji@linux-ipv6.org +1 -0 -# [TCP]: Put back tcp_timer_bug_msg[] symbol export. -# -# It is needed for tcp_reset_xmit_timer(), which is invoked by -# tcp_prequeue() which is invoked from tcp_ipv6.c -# -# Signed-off-by: Hideaki YOSHIFUJI -# Signed-off-by: David S. Miller - +[TCP]: Put back tcp_timer_bug_msg[] symbol export. + +It is needed for tcp_reset_xmit_timer(), which is invoked by +tcp_prequeue() which is invoked from tcp_ipv6.c + +Signed-off-by: Hideaki YOSHIFUJI +Signed-off-by: David S. Miller Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman diff -Nru a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c --- a/net/ipv4/tcp_timer.c 2005-03-09 17:20:38 -08:00