diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /net/ipv6/tcp_ipv6.c | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 51b9eff4c..9a5e2dfc7 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -5,7 +5,7 @@ * Authors: * Pedro Roque <roque@di.fc.ul.pt> * - * $Id: tcp_ipv6.c,v 1.2 1997/06/17 13:31:32 ralf Exp $ + * $Id: tcp_ipv6.c,v 1.35 1997/07/23 15:18:04 freitag Exp $ * * Based on: * linux/net/ipv4/tcp.c @@ -699,7 +699,6 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb, void *ptr, { struct tcp_opt tp; struct open_request *req; - __u16 req_mss; /* If the socket is dead, don't accept the connection. */ if (sk->dead) { @@ -1048,7 +1047,7 @@ struct sock *tcp_v6_check_req(struct sock *sk, struct sk_buff *skb) /* Check for syn retransmission */ flg = *(((u32 *)skb->h.th) + 3); - flg &= __constant_htonl(0x002f0000); + flg &= __constant_htonl(0x001f0000); if ((flg == __constant_htonl(0x00020000)) && (!after(skb->seq, req->rcv_isn))) { |