Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipv4: Don't use rt->rt_{src,dst} in ip_queue_xmit().

Browse Source 
Now we can pick it out of the provided flow key.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-05-06 22:30:20 -07:00
parent d9d8da805d
commit ea4fc0d619
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv4/ip_output.c
View File

@ -327,12 +327,12 @@ int ip_queue_xmit(struct sk_buff *skb, struct flowi *fl)
*/ */
rcu_read_lock(); rcu_read_lock();
inet_opt = rcu_dereference(inet->inet_opt); inet_opt = rcu_dereference(inet->inet_opt);
fl4 = &fl->u.ip4;
rt = skb_rtable(skb); rt = skb_rtable(skb);
if (rt != NULL) if (rt != NULL)
goto packet_routed; goto packet_routed;
/* Make sure we can route this packet. */ /* Make sure we can route this packet. */
fl4 = &fl->u.ip4;
rt = (struct rtable *)__sk_dst_check(sk, 0); rt = (struct rtable *)__sk_dst_check(sk, 0);
if (rt == NULL) { if (rt == NULL) {
__be32 daddr; __be32 daddr;
@ -360,7 +360,7 @@ int ip_queue_xmit(struct sk_buff *skb, struct flowi *fl)
skb_dst_set_noref(skb, &rt->dst); skb_dst_set_noref(skb, &rt->dst);
packet_routed: packet_routed:
if (inet_opt && inet_opt->opt.is_strictroute && rt->rt_dst != rt->rt_gateway) if (inet_opt && inet_opt->opt.is_strictroute && fl4->daddr != rt->rt_gateway)
goto no_route; goto no_route;
/* OK, we know where to send it, allocate and build IP header. */ /* OK, we know where to send it, allocate and build IP header. */
@ -374,8 +374,8 @@ packet_routed:
iph->frag_off = 0; iph->frag_off = 0;
iph->ttl = ip_select_ttl(inet, &rt->dst); iph->ttl = ip_select_ttl(inet, &rt->dst);
iph->protocol = sk->sk_protocol; iph->protocol = sk->sk_protocol;
iph->saddr = rt->rt_src; iph->saddr = fl4->saddr;
iph->daddr = rt->rt_dst; iph->daddr = fl4->daddr;
/* Transport layer set skb->h.foo itself. */ /* Transport layer set skb->h.foo itself. */
if (inet_opt && inet_opt->opt.optlen) { if (inet_opt && inet_opt->opt.optlen) {