Commit cc93fc51 authored by Peter Pan(潘卫平)'s avatar Peter Pan(潘卫平) Committed by David S. Miller
Browse files

tcp: delete unused parameter in tcp_nagle_check()

After commit d4589926

 (tcp: refine TSO splits), tcp_nagle_check() does
not use parameter mss_now anymore.
Signed-off-by: default avatarWeiping Pan <panweiping3@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e74dbb73
...@@ -1437,7 +1437,7 @@ static void tcp_minshall_update(struct tcp_sock *tp, unsigned int mss_now, ...@@ -1437,7 +1437,7 @@ static void tcp_minshall_update(struct tcp_sock *tp, unsigned int mss_now,
* With Minshall's modification: all sent small packets are ACKed. * With Minshall's modification: all sent small packets are ACKed.
*/ */
static bool tcp_nagle_check(bool partial, const struct tcp_sock *tp, static bool tcp_nagle_check(bool partial, const struct tcp_sock *tp,
unsigned int mss_now, int nonagle) int nonagle)
{ {
return partial && return partial &&
((nonagle & TCP_NAGLE_CORK) || ((nonagle & TCP_NAGLE_CORK) ||
...@@ -1469,7 +1469,7 @@ static unsigned int tcp_mss_split_point(const struct sock *sk, ...@@ -1469,7 +1469,7 @@ static unsigned int tcp_mss_split_point(const struct sock *sk,
* to include this last segment in this skb. * to include this last segment in this skb.
* Otherwise, we'll split the skb at last MSS boundary * Otherwise, we'll split the skb at last MSS boundary
*/ */
if (tcp_nagle_check(partial != 0, tp, mss_now, nonagle)) if (tcp_nagle_check(partial != 0, tp, nonagle))
return needed - partial; return needed - partial;
return needed; return needed;
...@@ -1532,7 +1532,7 @@ static inline bool tcp_nagle_test(const struct tcp_sock *tp, const struct sk_buf ...@@ -1532,7 +1532,7 @@ static inline bool tcp_nagle_test(const struct tcp_sock *tp, const struct sk_buf
if (tcp_urg_mode(tp) || (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)) if (tcp_urg_mode(tp) || (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN))
return true; return true;
if (!tcp_nagle_check(skb->len < cur_mss, tp, cur_mss, nonagle)) if (!tcp_nagle_check(skb->len < cur_mss, tp, nonagle))
return true; return true;
return false; return false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment