sctp: user perfect name for Delayed SACK Timer option

PATCH Superseded Shan Wei 4 participants 9 messages Jan 19, 2011 – Jan 20, 2011

Subsystems (3)

Networking Network drivers SCTP protocol

lore

Share & tools

lore

Shan Wei

author

2011-01-19 07:33 UTC #0 lore raw

PATCH 1/1 sctp: user perfect name for Delayed SACK Timer option

The option name of Delayed SACK Timer should be SCTP_DELAYED_SACK, not SCTP_DELAYED_ACK.

Reference:
8.1.19. Get or Set Delayed SACK Timer (SCTP_DELAYED_SACK) ï¼ˆhttp://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25)

Signed-off-by Shan Wei <[email protected]>

---
 include/net/sctp/user.h |    2 +-
 net/sctp/socket.c       |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

index 2b2769c..74e10d6 100644
@@ -77,7 +77,7 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_STATUS	14
 #define SCTP_GET_PEER_ADDR_INFO	15
 #define SCTP_DELAYED_ACK_TIME	16
-#define SCTP_DELAYED_ACK SCTP_DELAYED_ACK_TIME
+#define SCTP_DELAYED_SACK SCTP_DELAYED_ACK_TIME
 #define SCTP_CONTEXT	17
 #define SCTP_FRAGMENT_INTERLEAVE	18
 #define SCTP_PARTIAL_DELIVERY_POINT	19 /* Set/Get partial delivery point */

net/sctp/socket.c +2 -2

index a09b0dd..8e02550 100644
@@ -3428,7 +3428,7 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname,
 		retval = sctp_setsockopt_peer_addr_params(sk, optval, optlen);
 		break;
 
-	case SCTP_DELAYED_ACK:
+	case SCTP_DELAYED_SACK:
 		retval = sctp_setsockopt_delayed_ack(sk, optval, optlen);
 		break;
 	case SCTP_PARTIAL_DELIVERY_POINT:

@@ -5333,7 +5333,7 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
 		retval = sctp_getsockopt_peer_addr_params(sk, len, optval,
 							  optlen);
 		break;
-	case SCTP_DELAYED_ACK:
+	case SCTP_DELAYED_SACK:
 		retval = sctp_getsockopt_delayed_ack(sk, len, optval,
 							  optlen);
 		break;

Signature · 1 line

1.6.3.3

David Miller

maintainer

2011-01-19 07:38 UTC #1 lore raw

From: Shan Wei <[email protected]>
Date: Wed, 19 Jan 2011 15:33:30 +0800

Quoted 9 lines

The option name of Delayed SACK Timer should be SCTP_DELAYED_SACK, not SCTP_DELAYED_ACK.
Reference:
8.1.19. Get or Set Delayed SACK Timer (SCTP_DELAYED_SACK) （http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25)
Signed-off-by Shan Wei <[email protected]>

You can't make this change, you'll break applications using the existing definition.

Shan Wei

author

2011-01-19 08:17 UTC #2 lore raw

David Miller wrote, at 01/19/2011 03:39 PM:

Quoted 11 lines

From: Shan Wei <[email protected]>
Date: Wed, 19 Jan 2011 15:33:30 +0800
Quoted 8 lines
The option name of Delayed SACK Timer should be SCTP_DELAYED_SACK, not SCTP_DELAYED_ACK.
Reference:
8.1.19. Get or Set Delayed SACK Timer (SCTP_DELAYED_SACK) ï¼ˆhttp://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25)

Quoted 4 lines

Quoted 1 line
Signed-off-by Shan Wei <[email protected]>
You can't make this change, you'll break applications using the existing definition.

No documents guide user to use SCTP_DELAYED_ACK option. I double that there is no applications using this option.

If, there be. How about keeping this be concomitant with SCTP_DELAYED_SACK?

Signature · 3 lines

Best Regards
-----
Shan Wei

Wei Yongjun

2011-01-19 08:22 UTC #3 lore raw

Quoted 14 lines

David Miller wrote, at 01/19/2011 03:39 PM:
Quoted 11 lines
From: Shan Wei <[email protected]>
Date: Wed, 19 Jan 2011 15:33:30 +0800
Quoted 8 lines
The option name of Delayed SACK Timer should be SCTP_DELAYED_SACK, not SCTP_DELAYED_ACK.
Reference:
8.1.19. Get or Set Delayed SACK Timer (SCTP_DELAYED_SACK) ï¼ˆhttp://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25)

Quoted 7 lines

Quoted 3 lines
Quoted 1 line
Signed-off-by Shan Wei <[email protected]>
You can't make this change, you'll break applications using the existing definition.
No documents guide user to use SCTP_DELAYED_ACK option. I double that there is no applications using this option.
If, there be. How about keeping this be concomitant with SCTP_DELAYED_SACK?

You sould do as the same as the following patch, which has fixed the same problem of lksctp-tools, but not lksctp:

http://git.kernel.org/?p=linux/kernel/git/vxy/lksctp-tools.git;a=commit;hìdc6c0d3c3e40843916427923a45a93d748c1c6

Shan Wei

author

2011-01-19 08:39 UTC #4 lore raw

PATCH v2 1/1 sctp: user perfect name for Delayed SACK Timer option

In reply to Shan Wei

The option name of Delayed SACK Timer should be SCTP_DELAYED_SACK, not SCTP_DELAYED_ACK.

Left SCTP_DELAYED_ACK be concomitant with SCTP_DELAYED_SACK, for making compatibility with existing applications.

Reference:
8.1.19. Get or Set Delayed SACK Timer (SCTP_DELAYED_SACK) ï¼ˆhttp://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25)

Signed-off-by Shan Wei <[email protected]>

---
 include/net/sctp/user.h |    1 +
 net/sctp/socket.c       |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

include/net/sctp/user.h +1 -0

index 2b2769c..92eedc0 100644
@@ -78,6 +78,7 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_GET_PEER_ADDR_INFO	15
 #define SCTP_DELAYED_ACK_TIME	16
 #define SCTP_DELAYED_ACK SCTP_DELAYED_ACK_TIME
+#define SCTP_DELAYED_SACK SCTP_DELAYED_ACK_TIME
 #define SCTP_CONTEXT	17
 #define SCTP_FRAGMENT_INTERLEAVE	18
 #define SCTP_PARTIAL_DELIVERY_POINT	19 /* Set/Get partial delivery point */

net/sctp/socket.c +2 -2

index a09b0dd..8e02550 100644
@@ -3428,7 +3428,7 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname,
 		retval = sctp_setsockopt_peer_addr_params(sk, optval, optlen);
 		break;
 
-	case SCTP_DELAYED_ACK:
+	case SCTP_DELAYED_SACK:
 		retval = sctp_setsockopt_delayed_ack(sk, optval, optlen);
 		break;
 	case SCTP_PARTIAL_DELIVERY_POINT:

@@ -5333,7 +5333,7 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
 		retval = sctp_getsockopt_peer_addr_params(sk, len, optval,
 							  optlen);
 		break;
-	case SCTP_DELAYED_ACK:
+	case SCTP_DELAYED_SACK:
 		retval = sctp_getsockopt_delayed_ack(sk, len, optval,
 							  optlen);
 		break;

Signature · 1 line

1.6.3.3

Wei Yongjun

Acked-by on v2 1/1

2011-01-19 08:48 UTC #5 lore raw

Quoted 6 lines

The option name of Delayed SACK Timer should be SCTP_DELAYED_SACK, not SCTP_DELAYED_ACK.
Left SCTP_DELAYED_ACK be concomitant with SCTP_DELAYED_SACK, for making compatibility with existing applications.

SCTP_DELAYED_ACK is introduced by my typo when change it to API compliance two years ago. So:

Acked-by Wei Yongjun <[email protected]>

Shan Wei

author

2011-01-19 08:54 UTC #6 lore raw

Wei Yongjun wrote, at 01/19/2011 04:48 PM:

Quoted 11 lines

Quoted 6 lines
The option name of Delayed SACK Timer should be SCTP_DELAYED_SACK, not SCTP_DELAYED_ACK.
Left SCTP_DELAYED_ACK be concomitant with SCTP_DELAYED_SACK, for making compatibility with existing applications.
SCTP_DELAYED_ACK is introduced by my typo when change it to API compliance two years ago. So:
Acked-by Wei Yongjun <[email protected]>

Thanks for your work.

Signature · 3 lines

Best Regards
-----
Shan Wei

Vladislav Yasevich

Acked-by on v2 1/1

2011-01-19 13:37 UTC #7 lore raw

In reply to Shan Wei

Quoted 10 lines · Shan Wei

The option name of Delayed SACK Timer should be SCTP_DELAYED_SACK, not SCTP_DELAYED_ACK.
Left SCTP_DELAYED_ACK be concomitant with SCTP_DELAYED_SACK, for making compatibility with existing applications.
Reference:
8.1.19. Get or Set Delayed SACK Timer (SCTP_DELAYED_SACK) ï¼ˆhttp://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25)

this one much better.

Acked-by Vlad Yasevich <[email protected]>

-vlad

Quoted 40 lines

Signed-off-by Shan Wei <[email protected]>

---
 include/net/sctp/user.h |    1 +
 net/sctp/socket.c       |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

include/net/sctp/user.h +1 -0

index 2b2769c..92eedc0 100644
@@ -78,6 +78,7 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_GET_PEER_ADDR_INFO	15
 #define SCTP_DELAYED_ACK_TIME	16
 #define SCTP_DELAYED_ACK SCTP_DELAYED_ACK_TIME
+#define SCTP_DELAYED_SACK SCTP_DELAYED_ACK_TIME
 #define SCTP_CONTEXT	17
 #define SCTP_FRAGMENT_INTERLEAVE	18
 #define SCTP_PARTIAL_DELIVERY_POINT	19 /* Set/Get partial delivery point */

net/sctp/socket.c +2 -2

index a09b0dd..8e02550 100644
@@ -3428,7 +3428,7 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname,
 		retval = sctp_setsockopt_peer_addr_params(sk, optval, optlen);
 		break;
 
-	case SCTP_DELAYED_ACK:
+	case SCTP_DELAYED_SACK:
 		retval = sctp_setsockopt_delayed_ack(sk, optval, optlen);
 		break;
 	case SCTP_PARTIAL_DELIVERY_POINT:

@@ -5333,7 +5333,7 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
 		retval = sctp_getsockopt_peer_addr_params(sk, len, optval,
 							  optlen);
 		break;
-	case SCTP_DELAYED_ACK:
+	case SCTP_DELAYED_SACK:
 		retval = sctp_getsockopt_delayed_ack(sk, len, optval,
 							  optlen);
 		break;

David Miller

maintainer Applied

2011-01-20 00:51 UTC #8 lore raw

From: Vladislav Yasevich <[email protected]>
Date: Wed, 19 Jan 2011 08:37:08 -0500

Quoted 7 lines · Shan Wei

Quoted 6 lines
The option name of Delayed SACK Timer should be SCTP_DELAYED_SACK, not SCTP_DELAYED_ACK.
Left SCTP_DELAYED_ACK be concomitant with SCTP_DELAYED_SACK, for making compatibility with existing applications.

Quoted 8 lines

Quoted 4 lines
Reference:
8.1.19. Get or Set Delayed SACK Timer (SCTP_DELAYED_SACK) （http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25)
this one much better.
Acked-by Vlad Yasevich <[email protected]>

Applied, thanks.