From a49828f5b689ba412b17bc4cb4f1abefa3d10b13 Mon Sep 17 00:00:00 2001
From: Gilad Ben-Yossef <gilad@codefidence.com>
Date: Wed, 4 Nov 2009 23:23:10 -0800
Subject: [PATCH] --- yaml --- r: 171163 b: refs/heads/master c:
 6a2a2d6bf8581216e08be15fcb563cfd6c430e1e h: refs/heads/master i:   171161:
 8b129799ff655acb01d2a0cec326a0e3b67af557   171159:
 5b9302676ef744432fd30d707e404a7fd173681f v: v3

---
 [refs]                     | 2 +-
 trunk/include/net/dst.h    | 2 +-
 trunk/net/ipv4/tcp_input.c | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 720e1ebdf1d6..cb72de0af499 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05eaade2782fb0c90d3034fd7a7d5a16266182bb
+refs/heads/master: 6a2a2d6bf8581216e08be15fcb563cfd6c430e1e
diff --git a/trunk/include/net/dst.h b/trunk/include/net/dst.h
index 39c4a5963e12..387cb3cfde7e 100644
--- a/trunk/include/net/dst.h
+++ b/trunk/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/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index ba0eab65fe80..be0c5bf7bfca 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/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;