aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Laight <David.Laight@ACULAB.COM>2014-07-22 04:59:14 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-22 16:32:11 -0400
commit526cbef778ad8e763b95608d7e5c988b96bf4af5 (patch)
treecfc582070b2249d95002318732972cd59f7d142d
parent723189faca78f2b70fcf9088f056a2440986cc45 (diff)
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>
-rw-r--r--include/net/sctp/constants.h2
-rw-r--r--net/sctp/output.c4
-rw-r--r--net/sctp/outqueue.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index 307728f622ef..8c337cd0e1e4 100644
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -311,7 +311,7 @@ typedef enum {
311 SCTP_XMIT_OK, 311 SCTP_XMIT_OK,
312 SCTP_XMIT_PMTU_FULL, 312 SCTP_XMIT_PMTU_FULL,
313 SCTP_XMIT_RWND_FULL, 313 SCTP_XMIT_RWND_FULL,
314 SCTP_XMIT_NAGLE_DELAY, 314 SCTP_XMIT_DELAY,
315} sctp_xmit_t; 315} sctp_xmit_t;
316 316
317/* These are the commands for manipulating transports. */ 317/* These are the commands for manipulating transports. */
diff --git a/net/sctp/output.c b/net/sctp/output.c
index f3bf0ae244df..1eedba5195a3 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -178,7 +178,7 @@ sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *packet,
178 178
179 case SCTP_XMIT_RWND_FULL: 179 case SCTP_XMIT_RWND_FULL:
180 case SCTP_XMIT_OK: 180 case SCTP_XMIT_OK:
181 case SCTP_XMIT_NAGLE_DELAY: 181 case SCTP_XMIT_DELAY:
182 break; 182 break;
183 } 183 }
184 184
@@ -712,7 +712,7 @@ static sctp_xmit_t sctp_packet_can_append_data(struct sctp_packet *packet,
712 return SCTP_XMIT_OK; 712 return SCTP_XMIT_OK;
713 713
714 /* Defer until all data acked or packet full */ 714 /* Defer until all data acked or packet full */
715 return SCTP_XMIT_NAGLE_DELAY; 715 return SCTP_XMIT_DELAY;
716} 716}
717 717
718/* This private function does management things when adding DATA chunk */ 718/* This private function does management things when adding DATA chunk */
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index d31435e559b2..7e8f0a117106 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -629,7 +629,7 @@ redo:
629 done = 1; 629 done = 1;
630 break; 630 break;
631 631
632 case SCTP_XMIT_NAGLE_DELAY: 632 case SCTP_XMIT_DELAY:
633 /* Send this packet. */ 633 /* Send this packet. */
634 error = sctp_packet_transmit(pkt); 634 error = sctp_packet_transmit(pkt);
635 635
@@ -1015,7 +1015,7 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
1015 switch (status) { 1015 switch (status) {
1016 case SCTP_XMIT_PMTU_FULL: 1016 case SCTP_XMIT_PMTU_FULL:
1017 case SCTP_XMIT_RWND_FULL: 1017 case SCTP_XMIT_RWND_FULL:
1018 case SCTP_XMIT_NAGLE_DELAY: 1018 case SCTP_XMIT_DELAY:
1019 /* We could not append this chunk, so put 1019 /* We could not append this chunk, so put
1020 * the chunk back on the output queue. 1020 * the chunk back on the output queue.
1021 */ 1021 */