Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 526cbef778ad8e763b95608d7e5c988b96bf4af5

Authored by David Laight
Committed by David S. Miller
1 parent 723189faca

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>

Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff

include/net/sctp/constants.h
Diff comments   View file @ 526cbef
... ... @@ -311,7 +311,7 @@
311 311 SCTP_XMIT_OK,
312 312 SCTP_XMIT_PMTU_FULL,
313 313 SCTP_XMIT_RWND_FULL,
314   - SCTP_XMIT_NAGLE_DELAY,
  314 + SCTP_XMIT_DELAY,
315 315 } sctp_xmit_t;
316 316  
317 317 /* These are the commands for manipulating transports. */
... ... @@ -178,7 +178,7 @@
178 178  
179 179 case SCTP_XMIT_RWND_FULL:
180 180 case SCTP_XMIT_OK:
181   - case SCTP_XMIT_NAGLE_DELAY:
  181 + case SCTP_XMIT_DELAY:
182 182 break;
183 183 }
184 184  
... ... @@ -712,7 +712,7 @@
712 712 return SCTP_XMIT_OK;
713 713  
714 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 718 /* This private function does management things when adding DATA chunk */
... ... @@ -629,7 +629,7 @@
629 629 done = 1;
630 630 break;
631 631  
632   - case SCTP_XMIT_NAGLE_DELAY:
  632 + case SCTP_XMIT_DELAY:
633 633 /* Send this packet. */
634 634 error = sctp_packet_transmit(pkt);
635 635  
... ... @@ -1015,7 +1015,7 @@
1015 1015 switch (status) {
1016 1016 case SCTP_XMIT_PMTU_FULL:
1017 1017 case SCTP_XMIT_RWND_FULL:
1018   - case SCTP_XMIT_NAGLE_DELAY:
  1018 + case SCTP_XMIT_DELAY:
1019 1019 /* We could not append this chunk, so put
1020 1020 * the chunk back on the output queue.
1021 1021 */