From e0c409f02673a768e75bc1beb612d61e5fbf6d5f Mon Sep 17 00:00:00 2001 From: Vlad Yasevich Date: Wed, 28 Apr 2010 08:47:19 +0000 Subject: [PATCH] --- yaml --- r: 190370 b: refs/heads/master c: 0c42749cffbb4a06be86c5e5db6c7ebad548781f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sctp/associola.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7aea28439a64..315e9cb0dd8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 561b1733a465cf9677356b40c27653dd45f1ac56 +refs/heads/master: 0c42749cffbb4a06be86c5e5db6c7ebad548781f diff --git a/trunk/net/sctp/associola.c b/trunk/net/sctp/associola.c index df5abbff63e2..99c93ee98ad9 100644 --- a/trunk/net/sctp/associola.c +++ b/trunk/net/sctp/associola.c @@ -1194,8 +1194,10 @@ void sctp_assoc_update(struct sctp_association *asoc, /* Remove any peer addresses not present in the new association. */ list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) { trans = list_entry(pos, struct sctp_transport, transports); - if (!sctp_assoc_lookup_paddr(new, &trans->ipaddr)) - sctp_assoc_del_peer(asoc, &trans->ipaddr); + if (!sctp_assoc_lookup_paddr(new, &trans->ipaddr)) { + sctp_assoc_rm_peer(asoc, trans); + continue; + } if (asoc->state >= SCTP_STATE_ESTABLISHED) sctp_transport_reset(trans);