netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] sctp: user perfect name for Delayed SACK Timer option
@ 2011-01-19  7:33 Shan Wei
  2011-01-19  7:39 ` David Miller
  2011-01-19  8:39 ` [PATCH-v2] " Shan Wei
  0 siblings, 2 replies; 9+ messages in thread
From: Shan Wei @ 2011-01-19  7:33 UTC (permalink / raw)
  To: David Miller, Vlad Yasevich, 魏勇军,
	Network-Maillist

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 <shanwei@cn.fujitsu.com>
---
 include/net/sctp/user.h |    2 +-
 net/sctp/socket.c       |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index 2b2769c..74e10d6 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -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 */
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index a09b0dd..8e02550 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -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;
-- 
1.6.3.3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH] sctp: user perfect name for Delayed SACK Timer option
  2011-01-19  7:33 [PATCH] sctp: user perfect name for Delayed SACK Timer option Shan Wei
@ 2011-01-19  7:39 ` David Miller
  2011-01-19  8:17   ` Shan Wei
  2011-01-19  8:39 ` [PATCH-v2] " Shan Wei
  1 sibling, 1 reply; 9+ messages in thread
From: David Miller @ 2011-01-19  7:39 UTC (permalink / raw)
  To: shanwei; +Cc: vladislav.yasevich, yjwei, netdev, linux-sctp

From: Shan Wei <shanwei@cn.fujitsu.com>
Date: Wed, 19 Jan 2011 15:33:30 +0800

> 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 <shanwei@cn.fujitsu.com>

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] sctp: user perfect name for Delayed SACK Timer option
  2011-01-19  7:39 ` David Miller
@ 2011-01-19  8:17   ` Shan Wei
  2011-01-19  8:22     ` Wei Yongjun
  0 siblings, 1 reply; 9+ messages in thread
From: Shan Wei @ 2011-01-19  8:17 UTC (permalink / raw)
  To: David Miller; +Cc: vladislav.yasevich, yjwei, netdev, linux-sctp

David Miller wrote, at 01/19/2011 03:39 PM:
> From: Shan Wei <shanwei@cn.fujitsu.com>
> Date: Wed, 19 Jan 2011 15:33:30 +0800
> 
>> 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 <shanwei@cn.fujitsu.com>
> 
> 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?

-- 
Best Regards
-----
Shan Wei

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] sctp: user perfect name for Delayed SACK Timer option
  2011-01-19  8:17   ` Shan Wei
@ 2011-01-19  8:22     ` Wei Yongjun
  0 siblings, 0 replies; 9+ messages in thread
From: Wei Yongjun @ 2011-01-19  8:22 UTC (permalink / raw)
  To: Shan Wei; +Cc: David Miller, vladislav.yasevich, netdev, linux-sctp



> David Miller wrote, at 01/19/2011 03:39 PM:
>> From: Shan Wei <shanwei@cn.fujitsu.com>
>> Date: Wed, 19 Jan 2011 15:33:30 +0800
>>
>>> 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 <shanwei@cn.fujitsu.com>
>> 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=ecdc6c0d3c3e40843916427923a45a93d748c1c6




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH-v2] sctp: user perfect name for Delayed SACK Timer option
  2011-01-19  7:33 [PATCH] sctp: user perfect name for Delayed SACK Timer option Shan Wei
  2011-01-19  7:39 ` David Miller
@ 2011-01-19  8:39 ` Shan Wei
  2011-01-19  8:48   ` Wei Yongjun
  2011-01-19 13:37   ` Vladislav Yasevich
  1 sibling, 2 replies; 9+ messages in thread
From: Shan Wei @ 2011-01-19  8:39 UTC (permalink / raw)
  To: David Miller, Vlad Yasevich, 魏勇军,
	Network-Maillist

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 <shanwei@cn.fujitsu.com>
---
 include/net/sctp/user.h |    1 +
 net/sctp/socket.c       |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index 2b2769c..92eedc0 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -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 */
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index a09b0dd..8e02550 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -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;
-- 
1.6.3.3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH-v2] sctp: user perfect name for Delayed SACK Timer option
  2011-01-19  8:39 ` [PATCH-v2] " Shan Wei
@ 2011-01-19  8:48   ` Wei Yongjun
  2011-01-19  8:54     ` Shan Wei
  2011-01-19 13:37   ` Vladislav Yasevich
  1 sibling, 1 reply; 9+ messages in thread
From: Wei Yongjun @ 2011-01-19  8:48 UTC (permalink / raw)
  To: Shan Wei; +Cc: David Miller, Vlad Yasevich, Network-Maillist, SCTP-Maillist


> 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 <yjwei@cn.fujitsu.com>



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH-v2] sctp: user perfect name for Delayed SACK Timer option
  2011-01-19  8:48   ` Wei Yongjun
@ 2011-01-19  8:54     ` Shan Wei
  0 siblings, 0 replies; 9+ messages in thread
From: Shan Wei @ 2011-01-19  8:54 UTC (permalink / raw)
  To: Wei Yongjun; +Cc: David Miller, Vlad Yasevich, Network-Maillist, SCTP-Maillist

Wei Yongjun wrote, at 01/19/2011 04:48 PM:
> 
>> 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 <yjwei@cn.fujitsu.com>

Thanks for your work. 


-- 
Best Regards
-----
Shan Wei

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH-v2] sctp: user perfect name for Delayed SACK Timer option
  2011-01-19  8:39 ` [PATCH-v2] " Shan Wei
  2011-01-19  8:48   ` Wei Yongjun
@ 2011-01-19 13:37   ` Vladislav Yasevich
  2011-01-20  0:51     ` David Miller
  1 sibling, 1 reply; 9+ messages in thread
From: Vladislav Yasevich @ 2011-01-19 13:37 UTC (permalink / raw)
  To: Shan Wei
  Cc: David Miller, 魏勇军, Network-Maillist,
	SCTP-Maillist

On 01/19/2011 03:39 AM, Shan Wei wrote:
> 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 <vladislav.yasevich@hp.com>

-vlad

> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
> ---
>  include/net/sctp/user.h |    1 +
>  net/sctp/socket.c       |    4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
> index 2b2769c..92eedc0 100644
> --- a/include/net/sctp/user.h
> +++ b/include/net/sctp/user.h
> @@ -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 */
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index a09b0dd..8e02550 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -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;


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH-v2] sctp: user perfect name for Delayed SACK Timer option
  2011-01-19 13:37   ` Vladislav Yasevich
@ 2011-01-20  0:51     ` David Miller
  0 siblings, 0 replies; 9+ messages in thread
From: David Miller @ 2011-01-20  0:51 UTC (permalink / raw)
  To: vladislav.yasevich; +Cc: shanwei, yjwei, netdev, linux-sctp

From: Vladislav Yasevich <vladislav.yasevich@hp.com>
Date: Wed, 19 Jan 2011 08:37:08 -0500

> On 01/19/2011 03:39 AM, Shan Wei wrote:
>> 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 <vladislav.yasevich@hp.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2011-01-20  0:51 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-19  7:33 [PATCH] sctp: user perfect name for Delayed SACK Timer option Shan Wei
2011-01-19  7:39 ` David Miller
2011-01-19  8:17   ` Shan Wei
2011-01-19  8:22     ` Wei Yongjun
2011-01-19  8:39 ` [PATCH-v2] " Shan Wei
2011-01-19  8:48   ` Wei Yongjun
2011-01-19  8:54     ` Shan Wei
2011-01-19 13:37   ` Vladislav Yasevich
2011-01-20  0:51     ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).