diff options
| author |   Xin Long <lucien.xin@gmail.com> | 2015-12-30 23:50:49 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-01-05 12:24:01 -0500 |
| commit | b5eff7128366c4a7a9b502097a968ec9cae2bea2 (patch) | |
| tree | 7d82c07abe7e77d96983d3428697f2815e671204 /net/sctp/socket.c | |
| parent | sctp: apply rhashtable api to sctp procfs (diff) | |
| download | linux-dev-b5eff7128366c4a7a9b502097a968ec9cae2bea2.tar.xz linux-dev-b5eff7128366c4a7a9b502097a968ec9cae2bea2.zip | |
sctp: drop the old assoc hashtable of sctp
transport hashtable will replace the association hashtable,
so association hashtable is not used in sctp any more, so
drop the codes about that.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/sctp/socket.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index b5f4811cea82..9bb80ec4c08f 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1228,7 +1228,6 @@ out_free: * To the hash table, try to unhash it, just in case, its a noop * if it wasn't hashed so we're safe */ - sctp_unhash_established(asoc); sctp_association_free(asoc); } return err; @@ -1504,7 +1503,6 @@ static void sctp_close(struct sock *sk, long timeout) * ABORT or SHUTDOWN based on the linger options. */ if (sctp_state(asoc, CLOSED)) { - sctp_unhash_established(asoc); sctp_association_free(asoc); continue; } @@ -1986,10 +1984,8 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) goto out_unlock; out_free: - if (new_asoc) { - sctp_unhash_established(asoc); + if (new_asoc) sctp_association_free(asoc); - } out_unlock: release_sock(sk); |