From: Gilad Ben-Yossef Date: Thu, 5 Nov 2009 07:23:10 +0000 (-0800) Subject: tcp: Use defaults when no route options are available X-Git-Tag: v2.6.33-rc1~388^2~510 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a2a2d6bf8581216e08be15fcb563cfd6c430e1e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 Tested-by: Valdis.Kletnieks@vt.edu Signed-off-by: David S. Miller --- diff --git a/include/net/dst.h b/include/net/dst.h index 39c4a59..387cb3c 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -113,7 +113,7 @@ dst_metric(const struct dst_entry *dst, int metric) static inline u32 dst_feature(const struct dst_entry *dst, u32 feature) { - return dst_metric(dst, RTAX_FEATURES) & feature; + return (dst ? dst_metric(dst, RTAX_FEATURES) & feature : 0); } static inline u32 dst_mtu(const struct dst_entry *dst) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index ba0eab6..be0c5bf 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, struct tcphdr *th = tcp_hdr(skb); int length = (th->doff * 4) - sizeof(struct tcphdr); - BUG_ON(!estab && !dst); - ptr = (unsigned char *)(th + 1); opt_rx->saw_tstamp = 0;