projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'acpi-processor', 'acpi-cppc', 'acpi-apei' and 'acpi-sleep'
[cascardo/linux.git]
/
net
/
rds
/
tcp_listen.c
diff --git
a/net/rds/tcp_listen.c
b/net/rds/tcp_listen.c
index
686b1d0
..
245542c
100644
(file)
--- a/
net/rds/tcp_listen.c
+++ b/
net/rds/tcp_listen.c
@@
-138,7
+138,7
@@
int rds_tcp_accept_one(struct socket *sock)
rds_tcp_reset_callbacks(new_sock, conn);
conn->c_outgoing = 0;
/* rds_connect_path_complete() marks RDS_CONN_UP */
rds_tcp_reset_callbacks(new_sock, conn);
conn->c_outgoing = 0;
/* rds_connect_path_complete() marks RDS_CONN_UP */
- rds_connect_path_complete(conn, RDS_CONN_
DISCONNEC
TING);
+ rds_connect_path_complete(conn, RDS_CONN_
RESET
TING);
}
} else {
rds_tcp_set_callbacks(new_sock, conn);
}
} else {
rds_tcp_set_callbacks(new_sock, conn);