diff options
author | David S. Miller | 2016-06-30 11:03:36 +0200 |
---|---|---|
committer | David S. Miller | 2016-06-30 11:03:36 +0200 |
commit | ee58b57100ca953da7320c285315a95db2f7053d (patch) | |
tree | 77b815a31240adc4d6326346908137fc6c2c3a96 /net/rds/tcp_listen.c | |
parent | Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe... (diff) | |
parent | Merge tag 'nfs-for-4.7-2' of git://git.linux-nfs.org/projects/anna/linux-nfs (diff) | |
download | kernel-qcow2-linux-ee58b57100ca953da7320c285315a95db2f7053d.tar.gz kernel-qcow2-linux-ee58b57100ca953da7320c285315a95db2f7053d.tar.xz kernel-qcow2-linux-ee58b57100ca953da7320c285315a95db2f7053d.zip |
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>
Diffstat (limited to 'net/rds/tcp_listen.c')
-rw-r--r-- | net/rds/tcp_listen.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |