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>

2 files changed, 19 insertions, 18 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);
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 5efc57f5e605..5209ee7a3dc2 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -154,10 +154,10 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                            for now.
                          */
                         memset(&fl, 0, sizeof(fl));
-                        fl.proto = IPPROTO_DCCP;
+                        fl.flowi_proto = IPPROTO_DCCP;
                         ipv6_addr_copy(&fl.fl6_dst, &np->daddr);
                         ipv6_addr_copy(&fl.fl6_src, &np->saddr);
-                        fl.oif = sk->sk_bound_dev_if;
+                        fl.flowi_oif = sk->sk_bound_dev_if;
                         fl.fl_ip_dport = inet->inet_dport;
                         fl.fl_ip_sport = inet->inet_sport;
                         security_sk_classify_flow(sk, &fl);
@@ -248,11 +248,11 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req,
         struct dst_entry *dst;
 
         memset(&fl, 0, sizeof(fl));
-        fl.proto = IPPROTO_DCCP;
+        fl.flowi_proto = IPPROTO_DCCP;
         ipv6_addr_copy(&fl.fl6_dst, &ireq6->rmt_addr);
         ipv6_addr_copy(&fl.fl6_src, &ireq6->loc_addr);
         fl.fl6_flowlabel = 0;
-        fl.oif = ireq6->iif;
+        fl.flowi_oif = ireq6->iif;
         fl.fl_ip_dport = inet_rsk(req)->rmt_port;
         fl.fl_ip_sport = inet_rsk(req)->loc_port;
         security_req_classify_flow(req, &fl);
@@ -321,8 +321,8 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb)
         ipv6_addr_copy(&fl.fl6_dst, &rxip6h->saddr);
         ipv6_addr_copy(&fl.fl6_src, &rxip6h->daddr);
 
-        fl.proto = IPPROTO_DCCP;
-        fl.oif = inet6_iif(rxskb);
+        fl.flowi_proto = IPPROTO_DCCP;
+        fl.flowi_oif = inet6_iif(rxskb);
         fl.fl_ip_dport = dccp_hdr(skb)->dccph_dport;
         fl.fl_ip_sport = dccp_hdr(skb)->dccph_sport;
         security_skb_classify_flow(rxskb, &fl);
@@ -530,11 +530,11 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
                 struct flowi fl;
 
                 memset(&fl, 0, sizeof(fl));
-                fl.proto = IPPROTO_DCCP;
+                fl.flowi_proto = IPPROTO_DCCP;
                 ipv6_addr_copy(&fl.fl6_dst, &ireq6->rmt_addr);
                 final_p = fl6_update_dst(&fl, opt, &final);
                 ipv6_addr_copy(&fl.fl6_src, &ireq6->loc_addr);
-                fl.oif = sk->sk_bound_dev_if;
+                fl.flowi_oif = sk->sk_bound_dev_if;
                 fl.fl_ip_dport = inet_rsk(req)->rmt_port;
                 fl.fl_ip_sport = inet_rsk(req)->loc_port;
                 security_sk_classify_flow(sk, &fl);
@@ -953,10 +953,10 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         if (!ipv6_addr_any(&np->rcv_saddr))
                 saddr = &np->rcv_saddr;
 
-        fl.proto = IPPROTO_DCCP;
+        fl.flowi_proto = IPPROTO_DCCP;
         ipv6_addr_copy(&fl.fl6_dst, &np->daddr);
         ipv6_addr_copy(&fl.fl6_src, saddr ? saddr : &np->saddr);
-        fl.oif = sk->sk_bound_dev_if;
+        fl.flowi_oif = sk->sk_bound_dev_if;
         fl.fl_ip_dport = usin->sin6_port;
         fl.fl_ip_sport = inet->inet_sport;
         security_sk_classify_flow(sk, &fl);