From 3cb67985967eb2b00a09a2fef4a6efc273bf0fda Mon Sep 17 00:00:00 2001 From: Andrea Bittau Date: Tue, 3 Jan 2006 14:26:15 -0800 Subject: [PATCH] --- yaml --- r: 15583 b: refs/heads/master c: e84a9f5e9cd2b229dda24002334bc3cd36c1109d h: refs/heads/master i: 15581: 06b660323a03249a254b276bca7e2ad82dd93854 15579: 326b6ccd76ad69a53bfa742ee909bd918fdd2c3a 15575: 995765e2dd2482f9aa16fc3236f215c6c928bf93 15567: 82e2a28e0c931426a01d4d1f6ab12c49e064d17c 15551: e7d900b2103772023ce3f24b16426f76aa1b799a v: v3 --- [refs] | 2 +- trunk/net/dccp/input.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dfa7a5c11155..ec541c220103 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e377202d2c968dde8efd6121d94c7f0a77787aa +refs/heads/master: e84a9f5e9cd2b229dda24002334bc3cd36c1109d diff --git a/trunk/net/dccp/input.c b/trunk/net/dccp/input.c index cb0f5c9af1ba..b6cba72b44e8 100644 --- a/trunk/net/dccp/input.c +++ b/trunk/net/dccp/input.c @@ -492,14 +492,14 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, if (dcb->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ) dccp_event_ack_recv(sk, skb); - ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb); - ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb); - if (dp->dccps_options.dccpo_send_ack_vector && dccp_ackvec_add(dp->dccps_hc_rx_ackvec, sk, DCCP_SKB_CB(skb)->dccpd_seq, DCCP_ACKVEC_STATE_RECEIVED)) goto discard; + + ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb); + ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb); } /*