lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TCP]: tcp_write_xmit() tabbing cleanup

Browse Source 
Put the main basic block of work at the top-level of
tabbing, and mark the TCP_CLOSE test with unlikely().

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2005-07-05 15:19:06 -07:00
parent a762a98007
commit 92df7b518d
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
net/ipv4/tcp_output.c
View File

@@ -842,54 +842,54 @@ static inline void tcp_cwnd_validate(struct sock *sk, struct tcp_sock *tp)
static int tcp_write_xmit(struct sock *sk, int nonagle) static int tcp_write_xmit(struct sock *sk, int nonagle)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
struct sk_buff *skb;
unsigned int mss_now; unsigned int mss_now;
int sent_pkts;
/* If we are closed, the bytes will have to remain here. /* If we are closed, the bytes will have to remain here.
* In time closedown will finish, we empty the write queue and all * In time closedown will finish, we empty the write queue and all
* will be happy. * will be happy.
*/ */
if (sk->sk_state != TCP_CLOSE) { if (unlikely(sk->sk_state == TCP_CLOSE))
struct sk_buff *skb; return 0;
int sent_pkts = 0;
/* Account for SACKS, we may need to fragment due to this.
* It is just like the real MSS changing on us midstream.
* We also handle things correctly when the user adds some
* IP options mid-stream. Silly to do, but cover it.
*/
mss_now = tcp_current_mss(sk, 1);
while ((skb = sk->sk_send_head) && /* Account for SACKS, we may need to fragment due to this.
tcp_snd_test(sk, skb, mss_now, * It is just like the real MSS changing on us midstream.
tcp_skb_is_last(sk, skb) ? nonagle : * We also handle things correctly when the user adds some
TCP_NAGLE_PUSH)) { * IP options mid-stream. Silly to do, but cover it.
if (skb->len > mss_now) { */
if (tcp_fragment(sk, skb, mss_now)) mss_now = tcp_current_mss(sk, 1);
break; sent_pkts = 0;
} while ((skb = sk->sk_send_head) &&
tcp_snd_test(sk, skb, mss_now,
TCP_SKB_CB(skb)->when = tcp_time_stamp; tcp_skb_is_last(sk, skb) ? nonagle :
tcp_tso_set_push(skb); TCP_NAGLE_PUSH)) {
if (tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC))) if (skb->len > mss_now) {
if (tcp_fragment(sk, skb, mss_now))
break; break;
/* Advance the send_head. This one is sent out.
* This call will increment packets_out.
*/
update_send_head(sk, tp, skb);
tcp_minshall_update(tp, mss_now, skb);
sent_pkts = 1;
} }
if (sent_pkts) { TCP_SKB_CB(skb)->when = tcp_time_stamp;
tcp_cwnd_validate(sk, tp); tcp_tso_set_push(skb);
return 0; if (tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC)))
} break;
return !tp->packets_out && sk->sk_send_head; /* Advance the send_head. This one is sent out.
* This call will increment packets_out.
*/
update_send_head(sk, tp, skb);
tcp_minshall_update(tp, mss_now, skb);
sent_pkts = 1;
} }
return 0;
if (sent_pkts) {
tcp_cwnd_validate(sk, tp);
return 0;
}
return !tp->packets_out && sk->sk_send_head;
} }
/* Push out any pending frames which were held back due to /* Push out any pending frames which were held back due to