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, 9 insertions, 8 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 7882377bc62e..09a09911c5ea 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -465,14 +465,15 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk,
                                            struct sk_buff *skb)
 {
         struct rtable *rt;
-        struct flowi fl = { .oif = skb_rtable(skb)->rt_iif,
-                            .fl4_dst = ip_hdr(skb)->saddr,
-                            .fl4_src = ip_hdr(skb)->daddr,
-                            .fl4_tos = RT_CONN_FLAGS(sk),
-                            .proto = sk->sk_protocol,
-                            .fl_ip_sport = dccp_hdr(skb)->dccph_dport,
-                            .fl_ip_dport = dccp_hdr(skb)->dccph_sport
-                          };
+        struct flowi fl = {
+                .flowi_oif = skb_rtable(skb)->rt_iif,
+                .fl4_dst = ip_hdr(skb)->saddr,
+                .fl4_src = ip_hdr(skb)->daddr,
+                .fl4_tos = RT_CONN_FLAGS(sk),
+                .flowi_proto = sk->sk_protocol,
+                .fl_ip_sport = dccp_hdr(skb)->dccph_dport,
+                .fl_ip_dport = dccp_hdr(skb)->dccph_sport,
+        };
 
         security_skb_classify_flow(skb, &fl);
         rt = ip_route_output_flow(net, &fl, sk);