Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / rds / send.c

diff --git a/net/rds/send.c b/net/rds/send.c
index 96531d4..a82fb66 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;
@@ -1122,7 +1122,7 @@ rds_send_pong(struct rds_connection *conn, __be16 dport)
        rds_stats_inc(s_send_pong);
 
        if (!test_bit(RDS_LL_SEND_FULL, &conn->c_flags))
-               rds_send_xmit(conn);
+               queue_delayed_work(rds_wq, &conn->c_send_w, 0);
 
        rds_message_put(rm);
        return 0;