[TCP]: tcp_write_xmit() tabbing cleanup (92df7b51) · Commits · 戴 / test

net/ipv4/tcp_output.c

+34 −34

Original line number	Diff line number	Diff line
		@@ -842,15 +842,17 @@ static inline void tcp_cwnd_validate(struct sock sk, struct tcp_sock tp)
		static int tcp_write_xmit(struct sock *sk, int nonagle)
		{
		struct tcp_sock *tp = tcp_sk(sk);
		struct sk_buff *skb;
		unsigned int mss_now;
		int sent_pkts;

		/* If we are closed, the bytes will have to remain here.
		* In time closedown will finish, we empty the write queue and all
		* will be happy.
		*/
		if (sk->sk_state != TCP_CLOSE) {
		struct sk_buff *skb;
		int sent_pkts = 0;
		if (unlikely(sk->sk_state == TCP_CLOSE))
		return 0;


		/* Account for SACKS, we may need to fragment due to this.
		* It is just like the real MSS changing on us midstream.
		@@ -858,7 +860,7 @@ static int tcp_write_xmit(struct sock *sk, int nonagle)
		* IP options mid-stream. Silly to do, but cover it.
		*/
		mss_now = tcp_current_mss(sk, 1);

		sent_pkts = 0;
		while ((skb = sk->sk_send_head) &&
		tcp_snd_test(sk, skb, mss_now,
		tcp_skb_is_last(sk, skb) ? nonagle :
		@@ -889,8 +891,6 @@ static int tcp_write_xmit(struct sock *sk, int nonagle)

		return !tp->packets_out && sk->sk_send_head;
		}
		return 0;
		}

		/* Push out any pending frames which were held back due to
		* TCP_CORK or attempt at coalescing tiny packets.