aboutsummaryrefslogtreecommitdiffstats
path: root/net/rds/tcp_send.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/rds/tcp_send.c')
-rw-r--r--net/rds/tcp_send.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
index 2b3414f3c45c..710f1aae97ad 100644
--- a/net/rds/tcp_send.c
+++ b/net/rds/tcp_send.c
@@ -67,19 +67,19 @@ void rds_tcp_xmit_complete(struct rds_connection *conn)
67static int rds_tcp_sendmsg(struct socket *sock, void *data, unsigned int len) 67static int rds_tcp_sendmsg(struct socket *sock, void *data, unsigned int len)
68{ 68{
69 struct kvec vec = { 69 struct kvec vec = {
70 .iov_base = data, 70 .iov_base = data,
71 .iov_len = len, 71 .iov_len = len,
72 };
73 struct msghdr msg = {
74 .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL,
72 }; 75 };
73 struct msghdr msg = {
74 .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL,
75 };
76 76
77 return kernel_sendmsg(sock, &msg, &vec, 1, vec.iov_len); 77 return kernel_sendmsg(sock, &msg, &vec, 1, vec.iov_len);
78} 78}
79 79
80/* the core send_sem serializes this with other xmit and shutdown */ 80/* the core send_sem serializes this with other xmit and shutdown */
81int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm, 81int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm,
82 unsigned int hdr_off, unsigned int sg, unsigned int off) 82 unsigned int hdr_off, unsigned int sg, unsigned int off)
83{ 83{
84 struct rds_tcp_connection *tc = conn->c_transport_data; 84 struct rds_tcp_connection *tc = conn->c_transport_data;
85 int done = 0; 85 int done = 0;
@@ -197,7 +197,7 @@ void rds_tcp_write_space(struct sock *sk)
197 tc->t_last_seen_una = rds_tcp_snd_una(tc); 197 tc->t_last_seen_una = rds_tcp_snd_una(tc);
198 rds_send_drop_acked(conn, rds_tcp_snd_una(tc), rds_tcp_is_acked); 198 rds_send_drop_acked(conn, rds_tcp_snd_una(tc), rds_tcp_is_acked);
199 199
200 if ((atomic_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf) 200 if ((atomic_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf)
201 queue_delayed_work(rds_wq, &conn->c_send_w, 0); 201 queue_delayed_work(rds_wq, &conn->c_send_w, 0);
202 202
203out: 203out: