Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

9 files changed, 31 insertions, 30 deletions

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 334287602b78..e48bb1ba3dfc 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -112,7 +112,7 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even
                 }
         }
 
-        if (conn->c_version < RDS_PROTOCOL(3,1)) {
+        if (conn->c_version < RDS_PROTOCOL(3, 1)) {
                 printk(KERN_NOTICE "RDS/IB: Connection to %pI4 version %u.%u failed,"
                        " no longer supported\n",
                        &conn->c_faddr,
diff --git a/net/rds/loop.c b/net/rds/loop.c
index 268f07faaa1a..15f83db78f0c 100644
--- a/net/rds/loop.c
+++ b/net/rds/loop.c
@@ -96,8 +96,9 @@ out:
  */
 static void rds_loop_inc_free(struct rds_incoming *inc)
 {
-        struct rds_message *rm = container_of(inc, struct rds_message, m_inc);
-        rds_message_put(rm);
+        struct rds_message *rm = container_of(inc, struct rds_message, m_inc);
+
+        rds_message_put(rm);
 }
 
 /* we need to at least give the thread something to succeed */
diff --git a/net/rds/sysctl.c b/net/rds/sysctl.c
index c173f69e1479..e381bbcd9cc1 100644
--- a/net/rds/sysctl.c
+++ b/net/rds/sysctl.c
@@ -102,7 +102,8 @@ int rds_sysctl_init(void)
         rds_sysctl_reconnect_min = msecs_to_jiffies(1);
         rds_sysctl_reconnect_min_jiffies = rds_sysctl_reconnect_min;
 
-        rds_sysctl_reg_table = register_net_sysctl(&init_net,"net/rds", rds_sysctl_rds_table);
+        rds_sysctl_reg_table =
+                register_net_sysctl(&init_net, "net/rds", rds_sysctl_rds_table);
         if (!rds_sysctl_reg_table)
                 return -ENOMEM;
         return 0;
diff --git a/net/rds/tcp.h b/net/rds/tcp.h
index ec0602b0dc24..7940babf6c71 100644
--- a/net/rds/tcp.h
+++ b/net/rds/tcp.h
@@ -83,7 +83,7 @@ int rds_tcp_inc_copy_to_user(struct rds_incoming *inc, struct iov_iter *to);
 void rds_tcp_xmit_prepare(struct rds_connection *conn);
 void rds_tcp_xmit_complete(struct rds_connection *conn);
 int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm,
-                 unsigned int hdr_off, unsigned int sg, unsigned int off);
+                 unsigned int hdr_off, unsigned int sg, unsigned int off);
 void rds_tcp_write_space(struct sock *sk);
 
 /* tcp_stats.c */
diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c
index ba9ec67f4e41..96c2c4d17909 100644
--- a/net/rds/tcp_connect.c
+++ b/net/rds/tcp_connect.c
@@ -55,20 +55,20 @@ void rds_tcp_state_change(struct sock *sk)
 
         rdsdebug("sock %p state_change to %d\n", tc->t_sock, sk->sk_state);
 
-        switch(sk->sk_state) {
-                /* ignore connecting sockets as they make progress */
-                case TCP_SYN_SENT:
-                case TCP_SYN_RECV:
-                        break;
-                case TCP_ESTABLISHED:
-                        rds_connect_path_complete(&conn->c_path[0],
-                                                  RDS_CONN_CONNECTING);
-                        break;
-                case TCP_CLOSE_WAIT:
-                case TCP_CLOSE:
-                        rds_conn_drop(conn);
-                default:
-                        break;
+        switch (sk->sk_state) {
+        /* ignore connecting sockets as they make progress */
+        case TCP_SYN_SENT:
+        case TCP_SYN_RECV:
+                break;
+        case TCP_ESTABLISHED:
+                rds_connect_path_complete(&conn->c_path[0],
+                                          RDS_CONN_CONNECTING);
+                break;
+        case TCP_CLOSE_WAIT:
+        case TCP_CLOSE:
+                rds_conn_drop(conn);
+        default:
+                break;
         }
 out:
         read_unlock_bh(&sk->sk_callback_lock);
diff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c
index 22d9bb15f731..f9cc945a77b3 100644
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@ -140,7 +140,7 @@ int rds_tcp_accept_one(struct socket *sock)
                         conn->c_path[0].cp_outgoing = 0;
                         /* rds_connect_path_complete() marks RDS_CONN_UP */
                         rds_connect_path_complete(&conn->c_path[0],
-                                                  RDS_CONN_DISCONNECTING);
+                                                  RDS_CONN_RESETTING);
                 }
         } else {
                 rds_tcp_set_callbacks(new_sock, conn);
diff --git a/net/rds/tcp_recv.c b/net/rds/tcp_recv.c
index 3f8fb38996c7..4a87d9ef3084 100644
--- a/net/rds/tcp_recv.c
+++ b/net/rds/tcp_recv.c
@@ -172,7 +172,7 @@ static int rds_tcp_data_recv(read_descriptor_t *desc, struct sk_buff *skb,
         while (left) {
                 if (!tinc) {
                         tinc = kmem_cache_alloc(rds_tcp_incoming_slab,
-                                                arg->gfp);
+                                                arg->gfp);
                         if (!tinc) {
                                 desc->error = -ENOMEM;
                                 goto out;
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)
 static int rds_tcp_sendmsg(struct socket *sock, void *data, unsigned int len)
 {
         struct kvec vec = {
-                .iov_base = data,
-                .iov_len = len,
+                .iov_base = data,
+                .iov_len = len,
+        };
+        struct msghdr msg = {
+                .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL,
         };
-        struct msghdr msg = {
-                .msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL,
-        };
 
         return kernel_sendmsg(sock, &msg, &vec, 1, vec.iov_len);
 }
 
 /* the core send_sem serializes this with other xmit and shutdown */
 int rds_tcp_xmit(struct rds_connection *conn, struct rds_message *rm,
-                 unsigned int hdr_off, unsigned int sg, unsigned int off)
+                 unsigned int hdr_off, unsigned int sg, unsigned int off)
 {
         struct rds_tcp_connection *tc = conn->c_transport_data;
         int done = 0;
@@ -197,7 +197,7 @@ void rds_tcp_write_space(struct sock *sk)
         tc->t_last_seen_una = rds_tcp_snd_una(tc);
         rds_send_drop_acked(conn, rds_tcp_snd_una(tc), rds_tcp_is_acked);
 
-        if ((atomic_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf)
+        if ((atomic_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf)
                 queue_delayed_work(rds_wq, &conn->c_send_w, 0);
 
 out:
diff --git a/net/rds/transport.c b/net/rds/transport.c
index f3afd1d60d3c..2ffd3e30c643 100644
--- a/net/rds/transport.c
+++ b/net/rds/transport.c
@@ -140,8 +140,7 @@ unsigned int rds_trans_stats_info_copy(struct rds_info_iterator *iter,
         rds_info_iter_unmap(iter);
         down_read(&rds_trans_sem);
 
-        for (i = 0; i < RDS_TRANS_COUNT; i++)
-        {
+        for (i = 0; i < RDS_TRANS_COUNT; i++) {
                 trans = transports[i];
                 if (!trans || !trans->stats_info_copy)
                         continue;