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

Commit e76a28ca authored by Yuchung Cheng's avatar Yuchung Cheng Committed by Greg Kroah-Hartman
Browse files

tcp: helpers to send special DCTCP ack 



[ Upstream commit 2987babb6982306509380fc11b450227a844493b ]

Refactor and create helpers to send the special ACK in DCTCP.

Signed-off-by: default avatarYuchung Cheng <ycheng@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7d776e16

net/ipv4/tcp_output.c

+17 −5
Original line number Diff line number Diff line
@@ -884,8 +884,8 @@ out: 
 * We are working here with either a clone of the original

 * SKB, or a fresh unique copy made by the retransmit engine.

 */

static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,

			    gfp_t gfp_mask)

static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb,

			      int clone_it, gfp_t gfp_mask, u32 rcv_nxt)

{

	const struct inet_connection_sock *icsk = inet_csk(sk);

	struct inet_sock *inet;
@@ -948,7 +948,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, 
	th->source		= inet->inet_sport;

	th->dest		= inet->inet_dport;

	th->seq			= htonl(tcb->seq);

	th->ack_seq		= htonl(tp->rcv_nxt);

	th->ack_seq		= htonl(rcv_nxt);

	*(((__be16 *)th) + 6)	= htons(((tcp_header_size >> 2) << 12) |

					tcb->tcp_flags);
@@ -1019,6 +1019,13 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, 
	return net_xmit_eval(err);

}



static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,

			    gfp_t gfp_mask)

{

	return __tcp_transmit_skb(sk, skb, clone_it, gfp_mask,

				  tcp_sk(sk)->rcv_nxt);

}



/* This routine just queues the buffer for sending.

 *

 * NOTE: probe0 timer is not checked, do not forget tcp_push_pending_frames,
@@ -3220,7 +3227,7 @@ void tcp_send_delayed_ack(struct sock *sk) 
}



/* This routine sends an ack and also updates the window. */

void tcp_send_ack(struct sock *sk)

void __tcp_send_ack(struct sock *sk, u32 rcv_nxt)

{

	struct sk_buff *buff;
@@ -3249,7 +3256,12 @@ void tcp_send_ack(struct sock *sk) 


	/* Send it off, this clears delayed acks for us. */

	skb_mstamp_get(&buff->skb_mstamp);

	tcp_transmit_skb(sk, buff, 0, sk_gfp_atomic(sk, GFP_ATOMIC));

	__tcp_transmit_skb(sk, buff, 0, sk_gfp_atomic(sk, GFP_ATOMIC), rcv_nxt);

}



void tcp_send_ack(struct sock *sk)

{

	__tcp_send_ack(sk, tcp_sk(sk)->rcv_nxt);

}

EXPORT_SYMBOL_GPL(tcp_send_ack);