]> Pileus Git - ~andy/linux/commitdiff
Only parse time stamp TCP option in time wait sock
authorGilad Ben-Yossef <gilad@codefidence.com>
Wed, 28 Oct 2009 04:15:21 +0000 (04:15 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Oct 2009 08:28:39 +0000 (01:28 -0700)
Since we only use tcp_parse_options here to check for the exietence
of TCP timestamp option in the header, it is better to call with
the "established" flag on.

Signed-off-by: Gilad Ben-Yossef <gilad@codefidence.com>
Signed-off-by: Ori Finkelman <ori@comsleep.com>
Signed-off-by: Yony Amit <yony@comsleep.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_minisocks.c

index 4c03598ed9248f29fa721b4a3473fca83b21b18f..015e7c67dc889097285b4d673ab05c643011ed7c 100644 (file)
@@ -100,9 +100,9 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,
        struct tcp_options_received tmp_opt;
        int paws_reject = 0;
 
-       tmp_opt.saw_tstamp = 0;
        if (th->doff > (sizeof(*th) >> 2) && tcptw->tw_ts_recent_stamp) {
-               tcp_parse_options(skb, &tmp_opt, 0);
+               tmp_opt.tstamp_ok = 1;
+               tcp_parse_options(skb, &tmp_opt, 1);
 
                if (tmp_opt.saw_tstamp) {
                        tmp_opt.ts_recent       = tcptw->tw_ts_recent;