diff options
author | Gilad Ben-Yossef <gilad@codefidence.com> | 2009-11-05 02:23:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-05 02:24:15 -0500 |
commit | 6a2a2d6bf8581216e08be15fcb563cfd6c430e1e (patch) | |
tree | 001dd331cb0ef37fbb0e84bb557aaee9e22d8fc3 /net/ipv4/tcp_input.c | |
parent | 05eaade2782fb0c90d3034fd7a7d5a16266182bb (diff) |
tcp: Use defaults when no route options are available
Trying to parse the option of a SYN packet that we have
no route entry for should just use global wide defaults
for route entry options.
Signed-off-by: Gilad Ben-Yossef <gilad@codefidence.com>
Tested-by: Valdis.Kletnieks@vt.edu
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index ba0eab65fe80..be0c5bf7bfca 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -3704,8 +3704,6 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx, | |||
3704 | struct tcphdr *th = tcp_hdr(skb); | 3704 | struct tcphdr *th = tcp_hdr(skb); |
3705 | int length = (th->doff * 4) - sizeof(struct tcphdr); | 3705 | int length = (th->doff * 4) - sizeof(struct tcphdr); |
3706 | 3706 | ||
3707 | BUG_ON(!estab && !dst); | ||
3708 | |||
3709 | ptr = (unsigned char *)(th + 1); | 3707 | ptr = (unsigned char *)(th + 1); |
3710 | opt_rx->saw_tstamp = 0; | 3708 | opt_rx->saw_tstamp = 0; |
3711 | 3709 | ||