Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e84a9f5e authored by Andrea Bittau's avatar Andrea Bittau Committed by David S. Miller
Browse files

[DCCP]: Notify CCID only after ACK vectors have been processed. 



The CCID should be notified of packet reception only when a packet is
valid.  Therefore, the ACK vector needs to be processed before
notifying the CCID.  Also, the CCID might need information provided by
the ACK vector.

Signed-off-by: default avatarAndrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e377202

net/dccp/input.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

	}



	/*