ipv4: Use flowi4_init_output() in cookie_v4_check()
authorDavid S. Miller <davem@davemloft.net>
Thu, 31 Mar 2011 11:54:08 +0000 (04:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 31 Mar 2011 11:54:08 +0000 (04:54 -0700)
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/syncookies.c

index 8b44c6d2a79be9c956d2733d7f6547107d70b179..71e029691908d6bab909115ff023d30f86015d9b 100644 (file)
@@ -345,17 +345,13 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
         * no easy way to do this.
         */
        {
-               struct flowi4 fl4 = {
-                       .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 = IPPROTO_TCP,
-                       .flowi4_flags = inet_sk_flowi_flags(sk),
-                       .fl4_sport = th->dest,
-                       .fl4_dport = th->source,
-               };
+               struct flowi4 fl4;
+
+               flowi4_init_output(&fl4, 0, sk->sk_mark, RT_CONN_FLAGS(sk),
+                                  RT_SCOPE_UNIVERSE, IPPROTO_TCP,
+                                  inet_sk_flowi_flags(sk),
+                                  (opt && opt->srr) ? opt->faddr : ireq->rmt_addr,
+                                  ireq->loc_addr, th->source, th->dest);
                security_req_classify_flow(req, flowi4_to_flowi(&fl4));
                rt = ip_route_output_key(sock_net(sk), &fl4);
                if (IS_ERR(rt)) {