rpms/kernel/devel linux-2.6-tcp6-null-sk.patch, NONE, 1.1 .cvsignore, 1.321, 1.322 kernel-2.6.spec, 1.1844, 1.1845 sources, 1.263, 1.264 linux-2.6-powerpc-parport.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jan 12 01:27:09 UTC 2006
Author: dwmw2
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30618
Modified Files:
.cvsignore kernel-2.6.spec sources
Added Files:
linux-2.6-tcp6-null-sk.patch
Removed Files:
linux-2.6-powerpc-parport.patch
Log Message:
another interim linus update
linux-2.6-tcp6-null-sk.patch:
tcp_ipv6.c | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
--- NEW FILE linux-2.6-tcp6-null-sk.patch ---
--- linux-2.6.15/net/ipv6/tcp_ipv6.c~ 2006-01-11 17:43:09.000000000 +0000
+++ linux-2.6.15/net/ipv6/tcp_ipv6.c 2006-01-11 18:18:33.000000000 +0000
@@ -67,6 +67,9 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+/* Socket used for sending RSTs */
+static struct socket *tcp6_socket;
+
static void tcp_v6_send_reset(struct sk_buff *skb);
static void tcp_v6_reqsk_send_ack(struct sk_buff *skb, struct request_sock *req);
static void tcp_v6_send_check(struct sock *sk, int len,
@@ -611,7 +614,7 @@ static void tcp_v6_send_reset(struct sk_
if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) {
if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
- ip6_xmit(NULL, buff, &fl, NULL, 0);
+ ip6_xmit(tcp6_socket->sk, buff, &fl, NULL, 0);
TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
TCP_INC_STATS_BH(TCP_MIB_OUTRSTS);
return;
@@ -675,7 +678,7 @@ static void tcp_v6_send_ack(struct sk_bu
if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) {
if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
- ip6_xmit(NULL, buff, &fl, NULL, 0);
+ ip6_xmit(tcp6_socket->sk, buff, &fl, NULL, 0);
TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);
return;
}
@@ -1600,8 +1603,21 @@ static struct inet_protosw tcpv6_protosw
void __init tcpv6_init(void)
{
+ int err;
+
/* register inet6 protocol */
if (inet6_add_protocol(&tcpv6_protocol, IPPROTO_TCP) < 0)
printk(KERN_ERR "tcpv6_init: Could not register protocol\n");
inet6_register_protosw(&tcpv6_protosw);
+
+ err = sock_create_kern(PF_INET6, SOCK_RAW, IPPROTO_TCP, &tcp6_socket);
+ if (err < 0)
+ panic("Failed to create the TCPv6 control socket.\n");
+ tcp6_socket->sk->sk_allocation = GFP_ATOMIC;
+
+ /* Unhash it so that IP input processing does not even
+ * see it, we do not wish this socket to see incoming
+ * packets.
+ */
+ tcp6_socket->sk->sk_prot->unhash(tcp6_socket->sk);
}
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- .cvsignore 11 Jan 2006 13:04:20 -0000 1.321
+++ .cvsignore 12 Jan 2006 01:27:06 -0000 1.322
@@ -3,4 +3,4 @@
kernel-2.6.15
linux-2.6.15.tar.bz2
bcm43xx-20060111.tar.bz2
-patch-2.6.15-git7.bz2
+patch-2.6.15-git7a.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1844
retrieving revision 1.1845
diff -u -r1.1844 -r1.1845
--- kernel-2.6.spec 11 Jan 2006 21:59:09 -0000 1.1844
+++ kernel-2.6.spec 12 Jan 2006 01:27:06 -0000 1.1845
@@ -207,7 +207,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.15-git7.bz2
+Patch1: patch-2.6.15-git7a.bz2
#Patch2: patch-2.6.16-rc1-git1.bz2
# Patches 100 through 500 are meant for architecture patches
@@ -231,7 +231,6 @@
Patch310: linux-2.6-cell-spiderpic-no-devtree.patch
Patch313: linux-2.6-hvc-rtas-console.patch
Patch314: linux-2.6-ppc-rtas-check.patch
-Patch315: linux-2.6-powerpc-parport.patch
Patch317: linux-2.6-ppc-iseries-input-layer.patch
# 400 - 499 ia64
@@ -368,6 +367,9 @@
# ACPI patches.
Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch
+# TCPv6 oops fix
+Patch2200: linux-2.6-tcp6-null-sk.patch
+
# Broadcom wireless driver
Patch5000: linux-2.6-softmac-git.patch
Patch5001: linux-2.6-bcm43xx.patch
@@ -636,8 +638,6 @@
%patch313 -p1
# Check properly for successful RTAS instantiation
%patch314 -p1
-# Check before using legacy I/O ports which might crash the machine
-%patch315 -p1
# No input layer on iseries
%patch317 -p1
@@ -853,6 +853,8 @@
# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS.
%patch2100 -p1
+%patch2200 -p1
+
#
# Patches 5000 to 6000 are reserved for new drivers that are about to
# be merged upstream
@@ -1354,6 +1356,11 @@
%endif
%changelog
+* Thu Jan 12 2006 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.15-git7a -- another interim snapshot because stuff we care about
+ got fixed today
+- Fix TCPv6 oops when sending RST or ACK packets
+
* Wed Jan 11 2006 Dave Jones <davej at redhat.com>
- Make ATI chipset based x86-64 machines boot again.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- sources 11 Jan 2006 13:04:21 -0000 1.263
+++ sources 12 Jan 2006 01:27:06 -0000 1.264
@@ -1,4 +1,3 @@
cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2
e7291436e5d71b575dea034883cb42e5 bcm43xx-20060111.tar.bz2
-9bf813fab546b5a25cb9b59ce086c4b7 patch-2.6.15-git7.bz2
-
+f791ce18c0e962f30dce760274f6be07 patch-2.6.15-git7a.bz2
--- linux-2.6-powerpc-parport.patch DELETED ---
More information about the fedora-cvs-commits
mailing list