diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-04 21:03:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-04 21:03:30 +0200 |
| commit | dd927a2694ee412b440284dd72dd8e32caada3fc (patch) | |
| tree | 4f3c2b208d3f61a268139561e9d94f9d106b3946 /net/ipv4 | |
| parent | ipv4: Use flowi4->{daddr,saddr} in ipip_tunnel_xmit(). (diff) | |
| download | linux-dd927a2694ee412b440284dd72dd8e32caada3fc.tar.xz linux-dd927a2694ee412b440284dd72dd8e32caada3fc.zip | |
ipv4: In ip_build_and_send_pkt() use 'saddr' and 'daddr' args passed in.
Instead of rt->rt_{dst,src}
The only tricky part is source route option handling.
If the source route option is enabled we can't just use plain 'daddr',
we have to use opt->opt.faddr.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 3aa4c31e5448..db38c1822de8 100644 --- a/net/ipv4/ip_output.c +++ b/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); |