net: use the macros defined for the members of flowi

[net-next-2.6.git] / net / ipv4 / inet_connection_sock.c

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 7174370b1195b8f79c738c5b78f4156421bb50a1..06f5f8f482f0e092d86571b75846a60ea865d612 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -358,17 +358,14 @@ struct dst_entry *inet_csk_route_req(struct sock *sk,
        struct ip_options *opt = inet_rsk(req)->opt;
        struct flowi fl = { .oif = sk->sk_bound_dev_if,
                            .mark = sk->sk_mark,
-                           .nl_u = { .ip4_u =
-                                     { .daddr = ((opt && opt->srr) ?
-                                                 opt->faddr :
-                                                 ireq->rmt_addr),
-                                       .saddr = ireq->loc_addr,
-                                       .tos = RT_CONN_FLAGS(sk) } },
+                           .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),
-                           .uli_u = { .ports =
-                                      { .sport = inet_sk(sk)->inet_sport,
-                                        .dport = ireq->rmt_port } } };
+                           .fl_ip_sport = inet_sk(sk)->inet_sport,
+                           .fl_ip_dport = ireq->rmt_port };
        struct net *net = sock_net(sk);
 
        security_req_classify_flow(req, &fl);