summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorXin Long <lucien.xin@gmail.com>2015-12-30 16:50:50 +0100
committerDavid S. Miller <davem@davemloft.net>2016-01-05 18:24:02 +0100
commitc79c0666915418f9c0f01a6d0e93179416fb0c9e (patch)
tree457dc1b37d533fb20d9ea757fbce413c8d5a4f79 /net
parentsctp: drop the old assoc hashtable of sctp (diff)
downloadlinux-c79c0666915418f9c0f01a6d0e93179416fb0c9e.tar.xz
linux-c79c0666915418f9c0f01a6d0e93179416fb0c9e.zip
sctp: remove the local_bh_disable/enable in sctp_endpoint_lookup_assoc
sctp_endpoint_lookup_assoc is called in the protection of sock lock there is no need to call local_bh_disable in this function. so remove them. 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 'net')
-rw-r--r--net/sctp/endpointola.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index 8838bf492a12..52838eaa1582 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -317,7 +317,7 @@ struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *ep,
* We lookup the transport from hashtable at first, then get association
* through t->assoc.
*/
-static struct sctp_association *__sctp_endpoint_lookup_assoc(
+struct sctp_association *sctp_endpoint_lookup_assoc(
const struct sctp_endpoint *ep,
const union sctp_addr *paddr,
struct sctp_transport **transport)
@@ -342,21 +342,6 @@ out:
return asoc;
}
-/* Lookup association on an endpoint based on a peer address. BH-safe. */
-struct sctp_association *sctp_endpoint_lookup_assoc(
- const struct sctp_endpoint *ep,
- const union sctp_addr *paddr,
- struct sctp_transport **transport)
-{
- struct sctp_association *asoc;
-
- local_bh_disable();
- asoc = __sctp_endpoint_lookup_assoc(ep, paddr, transport);
- local_bh_enable();
-
- return asoc;
-}
-
/* Look for any peeled off association from the endpoint that matches the
* given peer address.
*/