Merge branch 'for-linus-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / net / sctp / socket.c

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index f23ad913dc7a070407813b44acb500a5f7c148e9..d5f4b4a8369bc64d8501be37d153e99dead88af5 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4392,10 +4392,7 @@ int sctp_transport_walk_start(struct rhashtable_iter *iter)
 {
        int err;
 
-       err = rhashtable_walk_init(&sctp_transport_hashtable, iter,
-                                  GFP_KERNEL);
-       if (err)
-               return err;
+       rhltable_walk_enter(&sctp_transport_hashtable, iter);
 
        err = rhashtable_walk_start(iter);
        if (err && err != -EAGAIN) {
@@ -4479,7 +4476,7 @@ int sctp_transport_lookup_process(int (*cb)(struct sctp_transport *, void *),
 
        rcu_read_lock();
        transport = sctp_addrs_lookup_transport(net, laddr, paddr);
-       if (!transport || !sctp_transport_hold(transport))
+       if (!transport)
                goto out;
 
        rcu_read_unlock();