From c6fa75f22bb9b0d2f6fd1639bbc05a3d712cc2a9 Mon Sep 17 00:00:00 2001
From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Wed, 11 Jun 2008 11:19:09 +0100
Subject: [PATCH] --- yaml --- r: 98082 b: refs/heads/master c:
 65907a433ac0ca450c4408080f24c6e4743386b2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d250b328bc22..ed3703fa528d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e2f0e5e8376f2a0ada8760fc9d3104e1a81382b
+refs/heads/master: 65907a433ac0ca450c4408080f24c6e4743386b2
diff --git a/trunk/net/dccp/options.c b/trunk/net/dccp/options.c
index d2a84a2fecee..43bc24e761d0 100644
--- a/trunk/net/dccp/options.c
+++ b/trunk/net/dccp/options.c
@@ -107,9 +107,11 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
 		 *
 		 * CCID-specific options are ignored during connection setup, as
 		 * negotiation may still be in progress (see RFC 4340, 10.3).
+		 * The same applies to Ack Vectors, as these depend on the CCID.
 		 *
 		 */
-		if (dreq != NULL && opt >= 128)
+		if (dreq != NULL && (opt >= 128 ||
+		    opt == DCCPO_ACK_VECTOR_0 || opt == DCCPO_ACK_VECTOR_1))
 			goto ignore_option;
 
 		switch (opt) {