ipv6: Convert to use flowi6 where applicable.

[firefly-linux-kernel-4.4.55.git] / net / ipv6 / ipv6_sockglue.c

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 1448c507fdff088ff4edbdb9bf0247e2199e48c4..9cb191ecaba8e7992834242364c745287157c317 100644 (file)
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -444,12 +444,12 @@ sticky_done:
        {
                struct ipv6_txoptions *opt = NULL;
                struct msghdr msg;
-               struct flowi fl;
+               struct flowi6 fl6;
                int junk;
 
-               fl.fl6_flowlabel = 0;
-               fl.flowi_oif = sk->sk_bound_dev_if;
-               fl.flowi_mark = sk->sk_mark;
+               memset(&fl6, 0, sizeof(fl6));
+               fl6.flowi6_oif = sk->sk_bound_dev_if;
+               fl6.flowi6_mark = sk->sk_mark;
 
                if (optlen == 0)
                        goto update;
@@ -475,7 +475,7 @@ sticky_done:
                msg.msg_controllen = optlen;
                msg.msg_control = (void*)(opt+1);
 
-               retv = datagram_send_ctl(net, &msg, &fl, opt, &junk, &junk,
+               retv = datagram_send_ctl(net, &msg, &fl6, opt, &junk, &junk,
                                         &junk);
                if (retv)
                        goto done;