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];