aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/options.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/options.c')
-rw-r--r--net/dccp/options.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/net/dccp/options.c b/net/dccp/options.c
index dabd6ee34d45..f06ffcfc8d71 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -128,13 +128,6 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
128 if (rc) 128 if (rc)
129 goto out_featneg_failed; 129 goto out_featneg_failed;
130 break; 130 break;
131 case DCCPO_ACK_VECTOR_0:
132 case DCCPO_ACK_VECTOR_1:
133 if (dccp_packet_without_ack(skb)) /* RFC 4340, 11.4 */
134 break;
135 dccp_pr_debug("%s Ack Vector (len=%u)\n", dccp_role(sk),
136 len);
137 break;
138 case DCCPO_TIMESTAMP: 131 case DCCPO_TIMESTAMP:
139 if (len != 4) 132 if (len != 4)
140 goto out_invalid_option; 133 goto out_invalid_option;
@@ -224,6 +217,16 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
224 pkt_type, opt, value, len)) 217 pkt_type, opt, value, len))
225 goto out_invalid_option; 218 goto out_invalid_option;
226 break; 219 break;
220 case DCCPO_ACK_VECTOR_0:
221 case DCCPO_ACK_VECTOR_1:
222 if (dccp_packet_without_ack(skb)) /* RFC 4340, 11.4 */
223 break;
224 /*
225 * Ack vectors are processed by the TX CCID if it is
226 * interested. The RX CCID need not parse Ack Vectors,
227 * since it is only interested in clearing old state.
228 * Fall through.
229 */
227 case DCCPO_MIN_TX_CCID_SPECIFIC ... DCCPO_MAX_TX_CCID_SPECIFIC: 230 case DCCPO_MIN_TX_CCID_SPECIFIC ... DCCPO_MAX_TX_CCID_SPECIFIC:
228 if (ccid_hc_tx_parse_options(dp->dccps_hc_tx_ccid, sk, 231 if (ccid_hc_tx_parse_options(dp->dccps_hc_tx_ccid, sk,
229 pkt_type, opt, value, len)) 232 pkt_type, opt, value, len))