diff options
author | David S. Miller <davem@davemloft.net> | 2017-05-26 20:46:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-26 20:46:35 -0400 |
commit | 34aa83c2fc23e055968387c8b78ac8bafd735aff (patch) | |
tree | a53a341d74613e512bf467ea12615f509cb53536 /net/sctp/associola.c | |
parent | 47936d35edbac5e58064bd15e51136050b2f2717 (diff) | |
parent | e2a9aa5ab2a4d1fb05fcdfa9661d54e437093297 (diff) | |
download | linux-34aa83c2fc23e055968387c8b78ac8bafd735aff.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net'
restricting a HW workaround alongside cleanups in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/associola.c')
-rw-r--r-- | net/sctp/associola.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index a9708da28eb5..95238284c422 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -1176,7 +1176,9 @@ void sctp_assoc_update(struct sctp_association *asoc, asoc->ctsn_ack_point = asoc->next_tsn - 1; asoc->adv_peer_ack_point = asoc->ctsn_ack_point; - if (!asoc->stream) { + + if (sctp_state(asoc, COOKIE_WAIT)) { + sctp_stream_free(asoc->stream); asoc->stream = new->stream; new->stream = NULL; } |