Commit 22008f56 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

Revert "Revert "sctp: Fix bundling of SHUTDOWN with COOKIE-ACK"" 



This reverts commit 7e9269a5.

As Jere notice, commit 35b4f244 ("sctp: do asoc update earlier
in sctp_sf_do_dupcook_a") only keeps the SHUTDOWN and COOKIE-ACK
with the same asoc, not transport. So we have to bring this patch
back.

Reported-by: default avatarJere Leppänen <jere.leppanen@nokia.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 643001b4

net/sctp/sm_statefuns.c

+3 −3
Original line number Diff line number Diff line
@@ -1903,7 +1903,7 @@ static enum sctp_disposition sctp_sf_do_dupcook_a( 
		 */

		sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(repl));

		return sctp_sf_do_9_2_start_shutdown(net, ep, asoc,

						     SCTP_ST_CHUNK(0), NULL,

						     SCTP_ST_CHUNK(0), repl,

						     commands);

	} else {

		sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE,
@@ -5549,7 +5549,7 @@ enum sctp_disposition sctp_sf_do_9_2_start_shutdown( 
	 * in the Cumulative TSN Ack field the last sequential TSN it

	 * has received from the peer.

	 */

	reply = sctp_make_shutdown(asoc, NULL);

	reply = sctp_make_shutdown(asoc, arg);

	if (!reply)

		goto nomem;
@@ -6147,7 +6147,7 @@ enum sctp_disposition sctp_sf_autoclose_timer_expire( 
	disposition = SCTP_DISPOSITION_CONSUME;

	if (sctp_outq_is_empty(&asoc->outqueue)) {

		disposition = sctp_sf_do_9_2_start_shutdown(net, ep, asoc, type,

							    arg, commands);

							    NULL, commands);

	}



	return disposition;