Merge tag 'stable/for-linus-3.14-rc0-late-tag' of git://git.kernel.org/pub/scm/linux...

[~andy/linux] / net / rds / send.c

diff --git a/net/rds/send.c b/net/rds/send.c
index 88eace57dd6bb11265bf3b765b5ac76cbb2ec3da..a82fb660ec009009b640ef66b1b1840432abd1f3 100644 (file)
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -922,7 +922,7 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
 {
        struct sock *sk = sock->sk;
        struct rds_sock *rs = rds_sk_to_rs(sk);
-       struct sockaddr_in *usin = (struct sockaddr_in *)msg->msg_name;
+       DECLARE_SOCKADDR(struct sockaddr_in *, usin, msg->msg_name);
        __be32 daddr;
        __be16 dport;
        struct rds_message *rm = NULL;