---

yaml --- r: 247061 b: refs/heads/master c: dd927a2 h: refs/heads/master i: 247059: 4e8d8c1 v: v3
git-mirror · May 4, 2011 · 7977911 · 7977911
1 parent 8f5d5d4
commit 7977911
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69458cb194e82972347a004054e0baed719ed008
+refs/heads/master: dd927a2694ee412b440284dd72dd8e32caada3fc
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
@@ -158,8 +158,8 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk,
 	else
 		iph->frag_off = 0;
 	iph->ttl      = ip_select_ttl(inet, &rt->dst);
-	iph->daddr    = rt->rt_dst;
-	iph->saddr    = rt->rt_src;
+	iph->daddr    = (opt && opt->opt.srr ? opt->opt.faddr : daddr);
+	iph->saddr    = saddr;
 	iph->protocol = sk->sk_protocol;
 	ip_select_ident(iph, &rt->dst, sk);