aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv4/tcp_output.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index e0a7b33fe953..21533f5e4a61 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1437,7 +1437,7 @@ static void tcp_minshall_update(struct tcp_sock *tp, unsigned int mss_now,
1437 * With Minshall's modification: all sent small packets are ACKed. 1437 * With Minshall's modification: all sent small packets are ACKed.
1438 */ 1438 */
1439static bool tcp_nagle_check(bool partial, const struct tcp_sock *tp, 1439static bool tcp_nagle_check(bool partial, const struct tcp_sock *tp,
1440 unsigned int mss_now, int nonagle) 1440 int nonagle)
1441{ 1441{
1442 return partial && 1442 return partial &&
1443 ((nonagle & TCP_NAGLE_CORK) || 1443 ((nonagle & TCP_NAGLE_CORK) ||
@@ -1469,7 +1469,7 @@ static unsigned int tcp_mss_split_point(const struct sock *sk,
1469 * to include this last segment in this skb. 1469 * to include this last segment in this skb.
1470 * Otherwise, we'll split the skb at last MSS boundary 1470 * Otherwise, we'll split the skb at last MSS boundary
1471 */ 1471 */
1472 if (tcp_nagle_check(partial != 0, tp, mss_now, nonagle)) 1472 if (tcp_nagle_check(partial != 0, tp, nonagle))
1473 return needed - partial; 1473 return needed - partial;
1474 1474
1475 return needed; 1475 return needed;
@@ -1532,7 +1532,7 @@ static inline bool tcp_nagle_test(const struct tcp_sock *tp, const struct sk_buf
1532 if (tcp_urg_mode(tp) || (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)) 1532 if (tcp_urg_mode(tp) || (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN))
1533 return true; 1533 return true;
1534 1534
1535 if (!tcp_nagle_check(skb->len < cur_mss, tp, cur_mss, nonagle)) 1535 if (!tcp_nagle_check(skb->len < cur_mss, tp, nonagle))
1536 return true; 1536 return true;
1537 1537
1538 return false; 1538 return false;