block: kill request_queue_t

[linux-2.6-omap-h63xx.git] / net / dccp / options.c

diff --git a/net/dccp/options.c b/net/dccp/options.c
index d2a84a2fecee6eaf663b4a23d8eabda76e6d08c7..43bc24e761d0e707fca63a4404e061c270a071bc 100644 (file)
--- a/net/dccp/options.c
+++ b/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) {