sctp: no need to check assoc id before calling sctp_assoc_set_id

sctp_assoc_set_id does the assoc id check in the beginning when
processing dupcookie, no need to do the same check before calling
it.

v1->v2:
  fix some typo errs Marcelo pointed in changelog.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 288c5e0..72b07dd 100644 (file)
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -1181,12 +1181,8 @@ void sctp_assoc_update(struct sctp_association *asoc,
                if (sctp_state(asoc, COOKIE_WAIT))
                        sctp_stream_update(&asoc->stream, &new->stream);
 
-               if (!asoc->assoc_id) {
-                       /* get a new association id since we don't have one
-                        * yet.
-                        */
-                       sctp_assoc_set_id(asoc, GFP_ATOMIC);
-               }
+               /* get a new assoc id if we don't have one yet. */
+               sctp_assoc_set_id(asoc, GFP_ATOMIC);
        }
 
        /* SCTP-AUTH: Save the peer parameters from the new associations