tree 3a72f0f6e92bec1db7cd4431fc04f454ac1d4569 parent 03ace394ac9bcad38043a381ae5f4860b9c9fa1c author Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> Sun, 21 Aug 2005 11:40:16 -0300 committer David S. Miller <[EMAIL PROTECTED]> Tue, 30 Aug 2005 06:03:52 -0700
[DCCP]: Fix ackno setting in SYNC/SYNCACK packets Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> Signed-off-by: David S. Miller <[EMAIL PROTECTED]> net/dccp/output.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/net/dccp/output.c b/net/dccp/output.c --- a/net/dccp/output.c +++ b/net/dccp/output.c @@ -44,15 +44,8 @@ int dccp_transmit_skb(struct sock *sk, s int err, set_ack = 1; u64 ackno = dp->dccps_gsr; - /* - * FIXME: study DCCP_PKT_SYNC[ACK] to see what is the right - * thing to do here... - */ dccp_inc_seqno(&dp->dccps_gss); - dcb->dccpd_seq = dp->dccps_gss; - dccp_insert_options(sk, skb); - switch (dcb->dccpd_type) { case DCCP_PKT_DATA: set_ack = 0; @@ -62,6 +55,9 @@ int dccp_transmit_skb(struct sock *sk, s ackno = dcb->dccpd_seq; break; } + + dcb->dccpd_seq = dp->dccps_gss; + dccp_insert_options(sk, skb); skb->h.raw = skb_push(skb, dccp_header_size); dh = dccp_hdr(skb); - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html