Linux-1.3.66

Linus Torvalds (Linus.Torvalds@cs.helsinki.fi)
Sun, 18 Feb 1996 10:56:09 +0200


Linus Torvalds: "Linux-1.3.65" (Feb 17, 11:52):
> I made a 1.3.65 release just a few moments ago. This release does

Ugh, it also had a few rather silly bugs, the worst of which was that
you couldn't unbloank the screen by just tapping the keyboard: you had
to switch the VC to get it to unblank. Also, tcp sockets tend to stay
in a CLOSE state..

So I did a 1.3.66 to get that fixed. For people with (C)SLIP and/or IP
masquerading, here is one additional patch (that will be in 1.3.67, but
that I missed for 1.3.66).

Linus

----------
--- v1.3.66/linux/drivers/net/slip.h Sun Feb 18 09:06:37 1996
+++ linux/drivers/net/slip.h Sun Feb 18 09:06:08 1996
@@ -14,6 +14,8 @@
* Dmitry Gorodchanin : Added CSLIP statistics.
* Stanislav Voronyi : Make line checking as created by
* Igor Chechik, RELCOM Corp.
+ * Craig Schlenter : Fixed #define bug that caused
+ * CSLIP telnets to hang in 1.3.61-6
*
* Author: Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
*/
@@ -89,8 +91,8 @@
#define SLF_INUSE 0 /* Channel in use */
#define SLF_ESCAPE 1 /* ESC received */
#define SLF_ERROR 2 /* Parity, etc. error */
-#define SLF_KEEPTEST 4 /* Keepalive test flag */
-#define SLF_OUTWAIT 8 /* is outpacket was flag */
+#define SLF_KEEPTEST 3 /* Keepalive test flag */
+#define SLF_OUTWAIT 4 /* is outpacket was flag */

unsigned char mode; /* SLIP mode */
#define SL_MODE_SLIP 0
--- v1.3.66/linux/net/ipv4/ip_fw.c Sat Feb 17 18:14:29 1996
+++ linux/net/ipv4/ip_fw.c Sun Feb 18 10:43:25 1996
@@ -905,7 +905,7 @@
}
else ms->timer.expires = jiffies+MASQUERADE_EXPIRE_TCP;

- skb->csum = csum_partial(th + 1, size - sizeof(*th), 0);
+ skb->csum = csum_partial((void *)(th + 1), size - sizeof(*th), 0);
tcp_send_check(th,iph->saddr,iph->daddr,size,skb);
}
add_timer(&ms->timer);
@@ -1011,7 +1011,7 @@
#endif
}
}
- skb->csum = csum_partial(portptr + sizeof(struct tcphdr),
+ skb->csum = csum_partial((void *)(((struct tcphdr *)portptr) + 1),
size - sizeof(struct tcphdr), 0);
tcp_send_check((struct tcphdr *)portptr,iph->saddr,iph->daddr,size,skb);
}
----------