Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

[karo-tx-linux.git] / net / ipv4 / inet_connection_sock.c

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 7f85d4aec26a17bb83ab80249b695be10715d55d..6c0b7f4a3d7d3c97e83a197e16809e6fdb071234 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -356,20 +356,23 @@ struct dst_entry *inet_csk_route_req(struct sock *sk,
        struct rtable *rt;
        const struct inet_request_sock *ireq = inet_rsk(req);
        struct ip_options *opt = inet_rsk(req)->opt;
-       struct flowi fl = { .oif = sk->sk_bound_dev_if,
-                           .mark = sk->sk_mark,
-                           .fl4_dst = ((opt && opt->srr) ?
-                                         opt->faddr : ireq->rmt_addr),
-                           .fl4_src = ireq->loc_addr,
-                           .fl4_tos = RT_CONN_FLAGS(sk),
-                           .proto = sk->sk_protocol,
-                           .flags = inet_sk_flowi_flags(sk),
-                           .fl_ip_sport = inet_sk(sk)->inet_sport,
-                           .fl_ip_dport = ireq->rmt_port };
+       struct flowi4 fl4 = {
+               .flowi4_oif = sk->sk_bound_dev_if,
+               .flowi4_mark = sk->sk_mark,
+               .daddr = ((opt && opt->srr) ?
+                         opt->faddr : ireq->rmt_addr),
+               .saddr = ireq->loc_addr,
+               .flowi4_tos = RT_CONN_FLAGS(sk),
+               .flowi4_proto = sk->sk_protocol,
+               .flowi4_flags = inet_sk_flowi_flags(sk),
+               .fl4_sport = inet_sk(sk)->inet_sport,
+               .fl4_dport = ireq->rmt_port,
+       };
        struct net *net = sock_net(sk);
 
-       security_req_classify_flow(req, &fl);
-       if (ip_route_output_flow(net, &rt, &fl, sk))
+       security_req_classify_flow(req, flowi4_to_flowi(&fl4));
+       rt = ip_route_output_flow(net, &fl4, sk);
+       if (IS_ERR(rt))
                goto no_route;
        if (opt && opt->is_strictroute && rt->rt_dst != rt->rt_gateway)
                goto route_err;