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

[mirror_ubuntu-bionic-kernel.git] / net / ipv4 / raw.c

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 467d570d087a93f4dbaa49220bc1b36138020057..b42b7cd56c0378f7915ea9372cb9b47f57506a96 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -418,7 +418,7 @@ static int raw_probe_proto_opt(struct flowi *fl, struct msghdr *msg)
                if (!iov)
                        continue;
 
-               switch (fl->proto) {
+               switch (fl->flowi_proto) {
                case IPPROTO_ICMP:
                        /* check if one-byte field is readable or not. */
                        if (iov->iov_base && iov->iov_len < 1)
@@ -548,14 +548,14 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
        }
 
        {
-               struct flowi fl = { .oif = ipc.oif,
-                                   .mark = sk->sk_mark,
+               struct flowi fl = { .flowi_oif = ipc.oif,
+                                   .flowi_mark = sk->sk_mark,
                                    .fl4_dst = daddr,
                                    .fl4_src = saddr,
                                    .fl4_tos = tos,
-                                   .proto = inet->hdrincl ? IPPROTO_RAW :
+                                   .flowi_proto = inet->hdrincl ? IPPROTO_RAW :
                                                             sk->sk_protocol,
-                                   .flags = FLOWI_FLAG_CAN_SLEEP,
+                                   .flowi_flags = FLOWI_FLAG_CAN_SLEEP,
                };
                if (!inet->hdrincl) {
                        err = raw_probe_proto_opt(&fl, msg);