[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110426.151200.179925027.davem@davemloft.net>
Date: Tue, 26 Apr 2011 15:12:00 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: netdev@...r.kernel.org
Subject: [PATCH 1/4] ipv4: Respect 'saddr' and 'daddr' args to
ip_build_and_send_pkt().
This function ignores the passed in addresses and forces their
settings using rt->rt_dst and rt->rt_src.
There is never a reason to do this, because the socket of the
callers of this function must know what addresses it is using.
Signed-off-by: David S. Miller <davem@...emloft.net>
---
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 bdad3d6..e0d0d5d 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 = daddr;
+ iph->saddr = saddr;
iph->protocol = sk->sk_protocol;
ip_select_ident(iph, &rt->dst, sk);
--
1.7.4.5
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists