From 5a2419d46a31a5a4420aa963af81456c815ca509 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Sat, 23 Aug 2008 13:28:27 +0200 Subject: [PATCH] --- yaml --- r: 111237 b: refs/heads/master c: 33c449675c0e371edd35b3bd7ce8a14451ff2f0b h: refs/heads/master i: 111235: fd38acda6ecac79d6ca2ca92ead39334ca9b10cc v: v3 --- [refs] | 2 +- trunk/net/dccp/input.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a66ad06e3f69..813ed77eeb6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4356b2920fd4861dd6c75f558749fa5c38a00e8 +refs/heads/master: 33c449675c0e371edd35b3bd7ce8a14451ff2f0b diff --git a/trunk/net/dccp/input.c b/trunk/net/dccp/input.c index 803933ab396d..779d0ed9ae94 100644 --- a/trunk/net/dccp/input.c +++ b/trunk/net/dccp/input.c @@ -370,7 +370,7 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb, goto discard; if (dccp_parse_options(sk, NULL, skb)) - goto discard; + return 1; if (DCCP_SKB_CB(skb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ) dccp_event_ack_recv(sk, skb); @@ -610,7 +610,7 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, * Step 8: Process options and mark acknowledgeable */ if (dccp_parse_options(sk, NULL, skb)) - goto discard; + return 1; if (dcb->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ) dccp_event_ack_recv(sk, skb);