From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shan Wei Date: Wed, 19 Jan 2011 08:39:00 +0000 Subject: [PATCH-v2] sctp: user perfect name for Delayed SACK Timer option Message-Id: <4D36A324.4040307@cn.fujitsu.com> List-Id: References: <4D3693CA.40508@cn.fujitsu.com> In-Reply-To: <4D3693CA.40508@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable To: David Miller , Vlad Yasevich , =?UTF-8?B?6a2P5YuH5Yab?= , Network-Maillist , SCTP-Mailli 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) =EF=BC=88http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25) Signed-off-by: Shan Wei --- 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 =3D sctp_setsockopt_peer_addr_params(sk, optval, optlen); break; =20 - case SCTP_DELAYED_ACK: + case SCTP_DELAYED_SACK: retval =3D 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 =3D sctp_getsockopt_peer_addr_params(sk, len, optval, optlen); break; - case SCTP_DELAYED_ACK: + case SCTP_DELAYED_SACK: retval =3D sctp_getsockopt_delayed_ack(sk, len, optval, optlen); break; --=20 1.6.3.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shan Wei Subject: [PATCH-v2] sctp: user perfect name for Delayed SACK Timer option Date: Wed, 19 Jan 2011 16:39:00 +0800 Message-ID: <4D36A324.4040307@cn.fujitsu.com> References: <4D3693CA.40508@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: David Miller , Vlad Yasevich , =?UTF-8?B?6a2P5YuH5Yab?= , Network-Maillist , SCTP-Mailli Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:55530 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753191Ab1ASImd convert rfc822-to-8bit (ORCPT ); Wed, 19 Jan 2011 03:42:33 -0500 In-Reply-To: <4D3693CA.40508@cn.fujitsu.com> Sender: netdev-owner@vger.kernel.org List-ID: 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) =EF=BC=88http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25) Signed-off-by: Shan Wei --- 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 poi= nt */ 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 =3D sctp_setsockopt_peer_addr_params(sk, optval, optlen); break; =20 - case SCTP_DELAYED_ACK: + case SCTP_DELAYED_SACK: retval =3D 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 =3D sctp_getsockopt_peer_addr_params(sk, len, optval, optlen); break; - case SCTP_DELAYED_ACK: + case SCTP_DELAYED_SACK: retval =3D sctp_getsockopt_delayed_ack(sk, len, optval, optlen); break; --=20 1.6.3.3