Skip to content

Commit

Permalink
net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Laight authored and David S. Miller committed Jul 22, 2014
1 parent 723189f commit 526cbef
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion include/net/sctp/constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
4 changes: 2 additions & 2 deletions net/sctp/output.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions net/sctp/outqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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.
*/
Expand Down

0 comments on commit 526cbef

Please sign in to comment.