From 254824d9fcffdd6ec5602390be681920dd6cb092 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Sun, 21 Aug 2005 05:40:16 -0300
Subject: [PATCH] --- yaml --- r: 6399 b: refs/heads/master c:
 24117727b753426d85ba09671c24854834f81b2c h: refs/heads/master i:   6397:
 9776ece0849061e37f31f90b06f4048dc7effa39   6395:
 df25e4d75700fc7fb727eef8e027cb09792008f2   6391:
 9cfd0bc81a1b390236cbbb46e0108eebd587abd9   6383:
 95d3b89f2829865a8474c3c4819dff7806b8521d   6367:
 c7598217dc29f3e3a6739415d23b297d953ee20e   6335:
 0465be8886d7ea9c83c403c4eebe48f046617db9   6271:
 59542c6726961b8183bb65412d54c2863f5f412e   6143:
 9167c976885a25b5c70cb3fa765105f863166dda v: v3

---
 [refs]                  |  2 +-
 trunk/net/dccp/output.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a7ff45868c32..4b352fd59ebf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03ace394ac9bcad38043a381ae5f4860b9c9fa1c
+refs/heads/master: 24117727b753426d85ba09671c24854834f81b2c
diff --git a/trunk/net/dccp/output.c b/trunk/net/dccp/output.c
index 384fd0920983..708fc3c0a969 100644
--- a/trunk/net/dccp/output.c
+++ b/trunk/net/dccp/output.c
@@ -44,15 +44,8 @@ int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
 		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, struct sk_buff *skb)
 			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);