* [PATCH net-next v3 2/3] net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY
@ 2014-07-22 8:59 David Laight
2014-07-22 13:03 ` Vlad Yasevich
2014-07-22 20:32 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: David Laight @ 2014-07-22 8:59 UTC (permalink / raw)
To: Linux Networking Development Mailing List,
'linux-sctp@vger.kernel.org'
Cc: David Miller
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>
---
Resend with corrected subject line.
No change from v2.
include/net/sctp/constants.h | 2 +-
net/sctp/output.c | 4 ++--
net/sctp/outqueue.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index 307728f..8c337cd 100644
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -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. */
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 553ba1d..7f28a8e 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,
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 */
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 9c77947..9ce0f3d 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -629,7 +629,7 @@ redo:
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.
*/
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v3 2/3] net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY
2014-07-22 8:59 [PATCH net-next v3 2/3] net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY David Laight
@ 2014-07-22 13:03 ` Vlad Yasevich
2014-07-22 20:32 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: Vlad Yasevich @ 2014-07-22 13:03 UTC (permalink / raw)
To: David Laight, Linux Networking Development Mailing List,
'linux-sctp@vger.kernel.org'
Cc: David Miller
On 07/22/2014 04:59 AM, David Laight wrote:
> 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>
-vlad
> ---
>
> Resend with corrected subject line.
>
> No change from v2.
>
> include/net/sctp/constants.h | 2 +-
> net/sctp/output.c | 4 ++--
> net/sctp/outqueue.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
> index 307728f..8c337cd 100644
> --- a/include/net/sctp/constants.h
> +++ b/include/net/sctp/constants.h
> @@ -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. */
> diff --git a/net/sctp/output.c b/net/sctp/output.c
> index 553ba1d..7f28a8e 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,
>
> 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 */
> diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
> index 9c77947..9ce0f3d 100644
> --- a/net/sctp/outqueue.c
> +++ b/net/sctp/outqueue.c
> @@ -629,7 +629,7 @@ redo:
> 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.
> */
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v3 2/3] net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY
@ 2014-07-22 13:03 ` Vlad Yasevich
0 siblings, 0 replies; 5+ messages in thread
From: Vlad Yasevich @ 2014-07-22 13:03 UTC (permalink / raw)
To: David Laight, Linux Networking Development Mailing List,
'linux-sctp@vger.kernel.org'
Cc: David Miller
On 07/22/2014 04:59 AM, David Laight wrote:
> 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>
-vlad
> ---
>
> Resend with corrected subject line.
>
> No change from v2.
>
> include/net/sctp/constants.h | 2 +-
> net/sctp/output.c | 4 ++--
> net/sctp/outqueue.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
> index 307728f..8c337cd 100644
> --- a/include/net/sctp/constants.h
> +++ b/include/net/sctp/constants.h
> @@ -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. */
> diff --git a/net/sctp/output.c b/net/sctp/output.c
> index 553ba1d..7f28a8e 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,
>
> 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 */
> diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
> index 9c77947..9ce0f3d 100644
> --- a/net/sctp/outqueue.c
> +++ b/net/sctp/outqueue.c
> @@ -629,7 +629,7 @@ redo:
> 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.
> */
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v3 2/3] net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY
2014-07-22 8:59 [PATCH net-next v3 2/3] net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY David Laight
@ 2014-07-22 20:32 ` David Miller
2014-07-22 20:32 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2014-07-22 20:32 UTC (permalink / raw)
To: David.Laight; +Cc: netdev, linux-sctp
From: David Laight <David.Laight@ACULAB.COM>
Date: Tue, 22 Jul 2014 08:59:14 +0000
> 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>
> ---
>
> Resend with corrected subject line.
>
> No change from v2.
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v3 2/3] net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY
@ 2014-07-22 20:32 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2014-07-22 20:32 UTC (permalink / raw)
To: David.Laight; +Cc: netdev, linux-sctp
From: David Laight <David.Laight@ACULAB.COM>
Date: Tue, 22 Jul 2014 08:59:14 +0000
> 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>
> ---
>
> Resend with corrected subject line.
>
> No change from v2.
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-07-22 20:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-22 8:59 [PATCH net-next v3 2/3] net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY David Laight
2014-07-22 13:03 ` Vlad Yasevich
2014-07-22 13:03 ` Vlad Yasevich
2014-07-22 20:32 ` David Miller
2014-07-22 20:32 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.