Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[mirror_ubuntu-artful-kernel.git] / net / key / af_key.c

diff --git a/net/key/af_key.c b/net/key/af_key.c
index f8ac939d52b4b83ce3720e274f33461347029661..f0d52d721b3a4405b47f38d8f5d6c1990cbf8b5f 100644 (file)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -709,7 +709,7 @@ static unsigned int pfkey_sockaddr_fill(const xfrm_address_t *xaddr, __be16 port
                sin6->sin6_family = AF_INET6;
                sin6->sin6_port = port;
                sin6->sin6_flowinfo = 0;
-               sin6->sin6_addr = *(struct in6_addr *)xaddr->a6;
+               sin6->sin6_addr = xaddr->in6;
                sin6->sin6_scope_id = 0;
                return 128;
            }
@@ -3588,8 +3588,7 @@ static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
 }
 #endif
 
-static int pfkey_sendmsg(struct kiocb *kiocb,
-                        struct socket *sock, struct msghdr *msg, size_t len)
+static int pfkey_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
 {
        struct sock *sk = sock->sk;
        struct sk_buff *skb = NULL;
@@ -3630,8 +3629,7 @@ out:
        return err ? : len;
 }
 
-static int pfkey_recvmsg(struct kiocb *kiocb,
-                        struct socket *sock, struct msghdr *msg, size_t len,
+static int pfkey_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
                         int flags)
 {
        struct sock *sk = sock->sk;