TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: tcp_sendmsg() only deals with CHECKSUM_PARTIAL

Browse Source 
We no longer have skbs with skb->ip_summed == CHECKSUM_NONE
in TCP write queues.

We can remove dead code in tcp_sendmsg().

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
2018-02-19 11:56:50 -08:00
committed by David S. Miller
parent dead7cdb0d
commit 65ec60973a
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/ipv4/tcp.c
+3 -8
View File
@@ -1254,14 +1254,10 @@ restart:
while (msg_data_left(msg)) { while (msg_data_left(msg)) {
int copy = 0; int copy = 0;
int max = size_goal;
skb = tcp_write_queue_tail(sk); skb = tcp_write_queue_tail(sk);
if (skb) { if (skb)
if (skb->ip_summed == CHECKSUM_NONE) copy = size_goal - skb->len;
max = mss_now;
copy = max - skb->len;
}
if (copy <= 0 || !tcp_skb_can_collapse_to(skb)) { if (copy <= 0 || !tcp_skb_can_collapse_to(skb)) {
bool first_skb; bool first_skb;
@@ -1290,7 +1286,6 @@ new_segment:
skb_entail(sk, skb); skb_entail(sk, skb);
copy = size_goal; copy = size_goal;
max = size_goal;
/* All packets are restored as if they have /* All packets are restored as if they have
* already been sent. skb_mstamp isn't set to * already been sent. skb_mstamp isn't set to
@@ -1374,7 +1369,7 @@ new_segment:
goto out; goto out;
} }
if (skb->len < max || (flags & MSG_OOB) || unlikely(tp->repair)) if (skb->len < size_goal || (flags & MSG_OOB) || unlikely(tp->repair))
continue; continue;
if (forced_push(tp)) { if (forced_push(tp)) {