net: Put flowi_* prefix on AF independent members of struct flowi

I intend to turn struct flowi into a union of AF specific flowi
structs.  There will be a common structure that each variant includes
first, much like struct sock_common.

This is the first step to move in that direction.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 9 deletions

diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index 0ad6ddf638a7..98d47dc60c89 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -345,15 +345,17 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
          * no easy way to do this.
          */
         {
-                struct flowi fl = { .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 = IPPROTO_TCP,
-                                    .flags = inet_sk_flowi_flags(sk),
-                                    .fl_ip_sport = th->dest,
-                                    .fl_ip_dport = th->source };
+                struct flowi fl = {
+                        .flowi_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),
+                        .flowi_proto = IPPROTO_TCP,
+                        .flowi_flags = inet_sk_flowi_flags(sk),
+                        .fl_ip_sport = th->dest,
+                        .fl_ip_dport = th->source,
+                };
                 security_req_classify_flow(req, &fl);
                 rt = ip_route_output_key(sock_net(sk), &fl);
                 if (IS_ERR(rt)) {