| Message ID | 4D36A324.4040307@cn.fujitsu.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
> 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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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.
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; -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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(-)