---

yaml --- r: 89983 b: refs/heads/master c: da7ef33 h: refs/heads/master i: 89981: 09f3811 89979: 5c9352f 89975: 4050db3 89967: 1a8392d 89951: e883e32 89919: 7d045ae 89855: 884b52d v: v3
git-mirror · Mar 3, 2008 · d18b1fa · d18b1fa
1 parent 9fb76f6
commit d18b1fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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];