Re: Linux-1.3.36

Linus Torvalds (Linus.Torvalds@cs.Helsinki.FI)
Wed, 25 Oct 1995 09:55:51 +0200


Linus Torvalds: "Re: Linux-1.3.36" (Oct 24, 16:08):
> Ok, Alan and I cleverly hid a extraneous line in the 1.3.36 linux kernel
> sources, just to check how alert you beta testers actually are. I'm sad
> to say that you don't seem to be very alert at all.. We had to fix it
> all by ourselves.

Duh. Alan added the extra line, and I just noticed I had removed
another line to make it all balance up. _This_ is the patch that fixes
1.3.36 networking.. (Note: it includes the patch that I sent out
earlier, so if you already applied that, just apply the af_inet.c part
of this one).

Linus

----------
diff -u --recursive --new-file v1.3.36/linux/net/ipv4/af_inet.c linux/net/ipv4/af_inet.c
--- v1.3.36/linux/net/ipv4/af_inet.c Mon Oct 23 18:02:22 1995
+++ linux/net/ipv4/af_inet.c Wed Oct 25 09:37:24 1995
@@ -230,6 +230,7 @@
while ((tmp = *skp) != NULL) {
if (!(tmp->rcv_saddr & mask))
break;
+ skp = &tmp->next;
}
sk->next = tmp;
*skp = sk;
diff -u --recursive --new-file v1.3.36/linux/net/ipv4/tcp.c linux/net/ipv4/tcp.c
--- v1.3.36/linux/net/ipv4/tcp.c Mon Oct 23 18:02:23 1995
+++ linux/net/ipv4/tcp.c Tue Oct 24 15:23:06 1995
@@ -1816,7 +1816,6 @@
from += copy;
copied += copy;
len -= copy;
- seglen -= copy;
sk->write_seq += copy;
seglen -= copy;
}
----------