diff options
author | Joel Stanley <joel@jms.id.au> | 2019-07-04 04:43:37 +0300 |
---|---|---|
committer | Joel Stanley <joel@jms.id.au> | 2019-07-04 04:43:41 +0300 |
commit | 2caf12c9ed84a39b383d0f237d1506b7e9a95bdf (patch) | |
tree | 8ba503d4cb7079f73d4b71f306c3e0c120cec53b /net/sctp/endpointola.c | |
parent | d83aec28b086ee676056638d77ac93b06ec3d4b1 (diff) | |
parent | 8584aaf1c3262ca17d1e4a614ede9179ef462bb0 (diff) | |
download | linux-dev-5.1.tar.xz |
Merge tag 'v5.1.16' into dev-5.1dev-5.1
This is the 5.1.16 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'net/sctp/endpointola.c')
-rw-r--r-- | net/sctp/endpointola.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 0448b68fce74..bcfc81ee153d 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c @@ -133,10 +133,6 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, /* Initialize the bind addr area */ sctp_bind_addr_init(&ep->base.bind_addr, 0); - /* Remember who we are attached to. */ - ep->base.sk = sk; - sock_hold(ep->base.sk); - /* Create the lists of associations. */ INIT_LIST_HEAD(&ep->asocs); @@ -169,6 +165,10 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, ep->prsctp_enable = net->sctp.prsctp_enable; ep->reconf_enable = net->sctp.reconf_enable; + /* Remember who we are attached to. */ + ep->base.sk = sk; + sock_hold(ep->base.sk); + return ep; nomem_shkey: |