diff options
author | David S. Miller <davem@davemloft.net> | 2019-11-25 14:57:26 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-11-25 14:57:26 -0800 |
commit | adf6f8cb3f4c2a15d5f35e6cf9ffeb6856d35312 (patch) | |
tree | f1ba8b47d05b9e30cd3ed11cc06fc524e1aba7c9 /net/sctp/associola.c | |
parent | c431047c4efe7903fb1c5a23e0f3f8eb1efc89f9 (diff) | |
parent | e58c1912418980f57ba2060017583067f5f71e52 (diff) | |
download | linux-stable-adf6f8cb3f4c2a15d5f35e6cf9ffeb6856d35312.tar.gz linux-stable-adf6f8cb3f4c2a15d5f35e6cf9ffeb6856d35312.tar.bz2 linux-stable-adf6f8cb3f4c2a15d5f35e6cf9ffeb6856d35312.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in networking bug fixes for merge window.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/associola.c')
-rw-r--r-- | net/sctp/associola.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 8f8d18abd013..bbd5004a5d09 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -64,6 +64,7 @@ static struct sctp_association *sctp_association_init( /* Discarding const is appropriate here. */ asoc->ep = (struct sctp_endpoint *)ep; asoc->base.sk = (struct sock *)sk; + asoc->base.net = sock_net(sk); sctp_endpoint_hold(asoc->ep); sock_hold(asoc->base.sk); |