]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
sctp: remove the local_bh_disable/enable in sctp_endpoint_lookup_assoc
authorXin Long <lucien.xin@gmail.com>
Wed, 30 Dec 2015 15:50:50 +0000 (23:50 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Jan 2016 17:24:02 +0000 (12:24 -0500)
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>
net/sctp/endpointola.c

index 8838bf492a12c06621564b7a3f58f8e505990b66..52838eaa15821f5ea10eb67d78d7b9f6088bd1a6 100644 (file)
@@ -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.
  */