Browse Source

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: David Laight <david.laight@aculab.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
David Laight 11 years ago
parent
commit
526cbef778
3 changed files with 5 additions and 5 deletions
  1. 1 1
      include/net/sctp/constants.h
  2. 2 2
      net/sctp/output.c
  3. 2 2
      net/sctp/outqueue.c

+ 1 - 1
include/net/sctp/constants.h

@@ -311,7 +311,7 @@ typedef enum {
 	SCTP_XMIT_OK,
 	SCTP_XMIT_OK,
 	SCTP_XMIT_PMTU_FULL,
 	SCTP_XMIT_PMTU_FULL,
 	SCTP_XMIT_RWND_FULL,
 	SCTP_XMIT_RWND_FULL,
-	SCTP_XMIT_NAGLE_DELAY,
+	SCTP_XMIT_DELAY,
 } sctp_xmit_t;
 } sctp_xmit_t;
 
 
 /* These are the commands for manipulating transports.  */
 /* These are the commands for manipulating transports.  */

+ 2 - 2
net/sctp/output.c

@@ -178,7 +178,7 @@ sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *packet,
 
 
 	case SCTP_XMIT_RWND_FULL:
 	case SCTP_XMIT_RWND_FULL:
 	case SCTP_XMIT_OK:
 	case SCTP_XMIT_OK:
-	case SCTP_XMIT_NAGLE_DELAY:
+	case SCTP_XMIT_DELAY:
 		break;
 		break;
 	}
 	}
 
 
@@ -712,7 +712,7 @@ static sctp_xmit_t sctp_packet_can_append_data(struct sctp_packet *packet,
 		return SCTP_XMIT_OK;
 		return SCTP_XMIT_OK;
 
 
 	/* Defer until all data acked or packet full */
 	/* 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 */
 /* This private function does management things when adding DATA chunk */

+ 2 - 2
net/sctp/outqueue.c

@@ -629,7 +629,7 @@ redo:
 			done = 1;
 			done = 1;
 			break;
 			break;
 
 
-		case SCTP_XMIT_NAGLE_DELAY:
+		case SCTP_XMIT_DELAY:
 			/* Send this packet. */
 			/* Send this packet. */
 			error = sctp_packet_transmit(pkt);
 			error = sctp_packet_transmit(pkt);
 
 
@@ -1015,7 +1015,7 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
 			switch (status) {
 			switch (status) {
 			case SCTP_XMIT_PMTU_FULL:
 			case SCTP_XMIT_PMTU_FULL:
 			case SCTP_XMIT_RWND_FULL:
 			case SCTP_XMIT_RWND_FULL:
-			case SCTP_XMIT_NAGLE_DELAY:
+			case SCTP_XMIT_DELAY:
 				/* We could not append this chunk, so put
 				/* We could not append this chunk, so put
 				 * the chunk back on the output queue.
 				 * the chunk back on the output queue.
 				 */
 				 */