diff --git a/[refs] b/[refs] index 70e8771c5273..53e1cdcc2994 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4d0ee983ec01e59a77e157ab702246f397b2a2b +refs/heads/master: 173372162ddbd414cc471c1a3a52ad7ea279aaf4 diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index e8c210182571..32f2249411fa 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -3473,7 +3473,7 @@ static int sctp_getsockopt_associnfo(struct sock *sk, int len, return -EINVAL; /* Values correspoinding to the specific association */ - if (assocparams.sasoc_assoc_id != 0) { + if (asoc) { assocparams.sasoc_asocmaxrxt = asoc->max_retrans; assocparams.sasoc_peer_rwnd = asoc->peer.rwnd; assocparams.sasoc_local_rwnd = asoc->a_rwnd;