From d18b1fad3720b025c860f2d43e21b42eeb31724e Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Mon, 3 Mar 2008 11:50:10 -0800
Subject: [PATCH] --- yaml --- r: 89983 b: refs/heads/master c:
 da7ef338a2982a3a0c7e2b1cdfd55ba35b34471e h: refs/heads/master i:   89981:
 09f381112b3d4b285581c835223e35e02e18f1a3   89979:
 5c9352f4f03a13b2407e2d9bd041105ed42000c9   89975:
 4050db316f49372251ce7d85eac952fdcb14245a   89967:
 1a8392d7c1094c7c57bd68b071e15f6e32026f2f   89951:
 e883e321dd3415bdbbeb66d70c81f09733df52d5   89919:
 7d045ae52df788954edc7e510ba82da0c2973a8a   89855:
 884b52dc23a4fda37d15bb76d08e978b0cb67d2b v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv4/ip_options.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8188298bf5c0..390a12bbdcee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d1c8d13c4f7690d382bca5de2f9dc88f22a4aab
+refs/heads/master: da7ef338a2982a3a0c7e2b1cdfd55ba35b34471e
diff --git a/trunk/net/ipv4/ip_options.c b/trunk/net/ipv4/ip_options.c
index 4d315158fd3c..baaedd9689a0 100644
--- a/trunk/net/ipv4/ip_options.c
+++ b/trunk/net/ipv4/ip_options.c
@@ -107,10 +107,7 @@ int ip_options_echo(struct ip_options * dopt, struct sk_buff * skb)
 	sptr = skb_network_header(skb);
 	dptr = dopt->__data;
 
-	if (skb->dst)
-		daddr = ((struct rtable*)skb->dst)->rt_spec_dst;
-	else
-		daddr = ip_hdr(skb)->daddr;
+	daddr = ((struct rtable*)skb->dst)->rt_spec_dst;
 
 	if (sopt->rr) {
 		optlen  = sptr[sopt->rr+1];