diff options
| author | Sowmini Varadhan <sowmini.varadhan@oracle.com> | 2016-06-30 16:11:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-01 16:45:17 -0400 |
| commit | 26e4e6bb683028546f339018ab4cd394300a92a4 (patch) | |
| tree | 005a9785454ea14946714b47383a4b43321101b8 /net/rds | |
| parent | 226f7a7d97e37220a442f52eb85ebff2cd6fc0d2 (diff) | |
| download | linux-26e4e6bb683028546f339018ab4cd394300a92a4.tar.bz2 | |
RDS: TCP: Remove dead logic around c_passive in rds-tcp
The c_passive bit is only intended for the IB transport and will
never be encountered in rds-tcp, so remove the dead logic that
predicates on this bit.
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/tcp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index b139630daaa4..c56fff28084f 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -329,11 +329,8 @@ static void rds_tcp_destroy_conns(void) INIT_LIST_HEAD(&rds_tcp_conn_list); spin_unlock_irq(&rds_tcp_conn_lock); - list_for_each_entry_safe(tc, _tc, &tmp_list, t_tcp_node) { - if (tc->conn->c_passive) - rds_conn_destroy(tc->conn->c_passive); + list_for_each_entry_safe(tc, _tc, &tmp_list, t_tcp_node) rds_conn_destroy(tc->conn); - } } static void rds_tcp_exit(void); @@ -512,8 +509,6 @@ static void rds_tcp_kill_sock(struct net *net) sk = tc->t_sock->sk; sk->sk_prot->disconnect(sk, 0); tcp_done(sk); - if (tc->conn->c_passive) - rds_conn_destroy(tc->conn->c_passive); rds_conn_destroy(tc->conn); } } |