diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /net/ipv4/syncookies.c | |
parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) |
Merge with Linux 2.2.8.
Diffstat (limited to 'net/ipv4/syncookies.c')
-rw-r--r-- | net/ipv4/syncookies.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c index c3e219d46..655176432 100644 --- a/net/ipv4/syncookies.c +++ b/net/ipv4/syncookies.c @@ -9,7 +9,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * $Id: syncookies.c,v 1.6 1998/06/10 07:29:22 davem Exp $ + * $Id: syncookies.c,v 1.7 1999/03/17 02:34:57 davem Exp $ * * Missing: IPv6 support. */ @@ -147,6 +147,8 @@ cookie_v4_check(struct sock *sk, struct sk_buff *skb, struct ip_options *opt) req->af.v4_req.rmt_addr = skb->nh.iph->saddr; req->class = &or_ipv4; /* for savety */ + req->af.v4_req.opt = NULL; + /* We throwed the options of the initial SYN away, so we hope * the ACK carries the same options again (see RFC1122 4.2.3.8) */ @@ -162,7 +164,6 @@ cookie_v4_check(struct sock *sk, struct sk_buff *skb, struct ip_options *opt) } } - req->af.v4_req.opt = NULL; req->snd_wscale = req->rcv_wscale = req->tstamp_ok = 0; req->wscale_ok = 0; req->expires = 0UL; |