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

Commit 2807d4ff authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[DCCP]: Fix seqno setting in dccp_v4_ctl_send_reset 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c68e64cf

net/dccp/ipv4.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -887,6 +887,7 @@ static void dccp_v4_ctl_send_reset(struct sk_buff *rxskb) 
				       sizeof(struct dccp_hdr_reset);

				       sizeof(struct dccp_hdr_reset);

	struct sk_buff *skb;

	struct sk_buff *skb;

	struct dst_entry *dst;

	struct dst_entry *dst;

	u64 seqno;





	/* Never send a reset in response to a reset. */

	/* Never send a reset in response to a reset. */

	if (rxdh->dccph_type == DCCP_PKT_RESET)

	if (rxdh->dccph_type == DCCP_PKT_RESET)
@@ -920,7 +921,12 @@ static void dccp_v4_ctl_send_reset(struct sk_buff *rxskb) 
	dccp_hdr_reset(skb)->dccph_reset_code =

	dccp_hdr_reset(skb)->dccph_reset_code =

				DCCP_SKB_CB(rxskb)->dccpd_reset_code;

				DCCP_SKB_CB(rxskb)->dccpd_reset_code;





	dccp_hdr_set_seq(dh, DCCP_SKB_CB(rxskb)->dccpd_ack_seq);

	/* See "8.3.1. Abnormal Termination" in draft-ietf-dccp-spec-11 */

	seqno = 0;

	if (DCCP_SKB_CB(rxskb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)

		dccp_set_seqno(&seqno, DCCP_SKB_CB(rxskb)->dccpd_ack_seq + 1);



	dccp_hdr_set_seq(dh, seqno);

	dccp_hdr_set_ack(dccp_hdr_ack_bits(skb),

	dccp_hdr_set_ack(dccp_hdr_ack_bits(skb),

			 DCCP_SKB_CB(rxskb)->dccpd_seq);

			 DCCP_SKB_CB(rxskb)->dccpd_seq);