aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_output.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-12 01:12:47 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-12 18:08:48 -0500
commit9d6ec938019c6b16cb9ec96598ebe8f20de435fe (patch)
tree9b850eb7fd48a6e5ffc15f47afd2e3edc93f5290 /net/ipv4/ip_output.c
parent68a5e3dd0a0056d8b349f9eea3756adda53ec17a (diff)
ipv4: Use flowi4 in public route lookup interfaces.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r--net/ipv4/ip_output.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 67e5f7130322..2b9cc40397ee 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1474,18 +1474,18 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar
1474 } 1474 }
1475 1475
1476 { 1476 {
1477 struct flowi fl = { 1477 struct flowi4 fl4 = {
1478 .flowi_oif = arg->bound_dev_if, 1478 .flowi4_oif = arg->bound_dev_if,
1479 .fl4_dst = daddr, 1479 .daddr = daddr,
1480 .fl4_src = rt->rt_spec_dst, 1480 .saddr = rt->rt_spec_dst,
1481 .fl4_tos = RT_TOS(ip_hdr(skb)->tos), 1481 .flowi4_tos = RT_TOS(ip_hdr(skb)->tos),
1482 .fl4_sport = tcp_hdr(skb)->dest, 1482 .uli.ports.sport = tcp_hdr(skb)->dest,
1483 .fl4_dport = tcp_hdr(skb)->source, 1483 .uli.ports.dport = tcp_hdr(skb)->source,
1484 .flowi_proto = sk->sk_protocol, 1484 .flowi4_proto = sk->sk_protocol,
1485 .flowi_flags = ip_reply_arg_flowi_flags(arg), 1485 .flowi4_flags = ip_reply_arg_flowi_flags(arg),
1486 }; 1486 };
1487 security_skb_classify_flow(skb, &fl); 1487 security_skb_classify_flow(skb, flowi4_to_flowi(&fl4));
1488 rt = ip_route_output_key(sock_net(sk), &fl); 1488 rt = ip_route_output_key(sock_net(sk), &fl4);
1489 if (IS_ERR(rt)) 1489 if (IS_ERR(rt))
1490 return; 1490 return;
1491 } 1491 }