Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 526cbef7 authored by David Laight's avatar David Laight Committed by David S. Miller
Browse files

net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY 



MSG_MORE and 'corking' a socket would require that the transmit of
a data chunk be delayed.
Rename the return value to be less specific.

Signed-off-by: default avatarDavid Laight <david.laight@aculab.com>
Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 723189fa

include/net/sctp/constants.h

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ typedef enum { 
	SCTP_XMIT_OK,

	SCTP_XMIT_PMTU_FULL,

	SCTP_XMIT_RWND_FULL,

	SCTP_XMIT_NAGLE_DELAY,

	SCTP_XMIT_DELAY,

} sctp_xmit_t;



/* These are the commands for manipulating transports.  */

net/sctp/output.c

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *packet, 


	case SCTP_XMIT_RWND_FULL:

	case SCTP_XMIT_OK:

	case SCTP_XMIT_NAGLE_DELAY:

	case SCTP_XMIT_DELAY:

		break;

	}
@@ -712,7 +712,7 @@ static sctp_xmit_t sctp_packet_can_append_data(struct sctp_packet *packet, 
		return SCTP_XMIT_OK;



	/* Defer until all data acked or packet full */

	return SCTP_XMIT_NAGLE_DELAY;

	return SCTP_XMIT_DELAY;

}



/* This private function does management things when adding DATA chunk */

net/sctp/outqueue.c

+2 −2
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt, 
			done = 1;

			break;



		case SCTP_XMIT_NAGLE_DELAY:

		case SCTP_XMIT_DELAY:

			/* Send this packet. */

			error = sctp_packet_transmit(pkt);
@@ -1015,7 +1015,7 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) 
			switch (status) {

			case SCTP_XMIT_PMTU_FULL:

			case SCTP_XMIT_RWND_FULL:

			case SCTP_XMIT_NAGLE_DELAY:

			case SCTP_XMIT_DELAY:

				/* We could not append this chunk, so put

				 * the chunk back on the output queue.

				 */