---

yaml
---
r: 6399
b: refs/heads/master
c: 2411772
h: refs/heads/master
i:
  6397: 9776ece
  6395: df25e4d
  6391: 9cfd0bc
  6383: 95d3b89
  6367: c759821
  6335: 0465be8
  6271: 59542c6
  6143: 9167c97
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03ace394ac9bcad38043a381ae5f4860b9c9fa1c
+refs/heads/master: 24117727b753426d85ba09671c24854834f81b2c

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);