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, 3 insertions, 3 deletions

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index a88b2e9d25f1..35b0be0463f9 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -655,12 +655,12 @@ int inet6_sk_rebuild_header(struct sock *sk)
                 struct flowi fl;
 
                 memset(&fl, 0, sizeof(fl));
-                fl.proto = sk->sk_protocol;
+                fl.flowi_proto = sk->sk_protocol;
                 ipv6_addr_copy(&fl.fl6_dst, &np->daddr);
                 ipv6_addr_copy(&fl.fl6_src, &np->saddr);
                 fl.fl6_flowlabel = np->flow_label;
-                fl.oif = sk->sk_bound_dev_if;
-                fl.mark = sk->sk_mark;
+                fl.flowi_oif = sk->sk_bound_dev_if;
+                fl.flowi_mark = sk->sk_mark;
                 fl.fl_ip_dport = inet->inet_dport;
                 fl.fl_ip_sport = inet->inet_sport;
                 security_sk_classify_flow(sk, &fl);