net: use the macros defined for the members of flowi

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

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index f581f77d1097ca140c74e93072113d88ae0cc9bc..f2b61107df6cd8066d7e3568b1625de309966522 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1148,21 +1148,13 @@ int inet_sk_rebuild_header(struct sock *sk)
        struct flowi fl = {
                .oif = sk->sk_bound_dev_if,
                .mark = sk->sk_mark,
-               .nl_u = {
-                       .ip4_u = {
-                               .daddr  = daddr,
-                               .saddr  = inet->inet_saddr,
-                               .tos    = RT_CONN_FLAGS(sk),
-                       },
-               },
+               .fl4_dst = daddr,
+               .fl4_src = inet->inet_saddr,
+               .fl4_tos = RT_CONN_FLAGS(sk),
                .proto = sk->sk_protocol,
                .flags = inet_sk_flowi_flags(sk),
-               .uli_u = {
-                       .ports = {
-                               .sport = inet->inet_sport,
-                               .dport = inet->inet_dport,
-                       },
-               },
+               .fl_ip_sport = inet->inet_sport,
+               .fl_ip_dport = inet->inet_dport,
        };
 
        security_sk_classify_flow(sk, &fl);