diff options
| author | Peter Pan(潘卫平) <panweiping3@gmail.com> | 2014-03-24 07:49:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-26 20:43:40 +0100 |
| commit | cc93fc51f3a1cc9eae7d1deb3cb8226d08c4ca58 (patch) | |
| tree | 23ec423bc65c24907511445abaae39704285ca2e /net | |
| parent | Merge branch 'bnx2x-next' (diff) | |
| download | linux-cc93fc51f3a1cc9eae7d1deb3cb8226d08c4ca58.tar.xz linux-cc93fc51f3a1cc9eae7d1deb3cb8226d08c4ca58.zip | |
tcp: delete unused parameter in tcp_nagle_check()
After commit d4589926d7a9 (tcp: refine TSO splits), tcp_nagle_check() does
not use parameter mss_now anymore.
Signed-off-by: Weiping Pan <panweiping3@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_output.c | 6 |
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, * With Minshall's modification: all sent small packets are ACKed. */ static bool tcp_nagle_check(bool partial, const struct tcp_sock *tp, - unsigned int mss_now, int nonagle) + int nonagle) { return partial && ((nonagle & TCP_NAGLE_CORK) || @@ -1469,7 +1469,7 @@ static unsigned int tcp_mss_split_point(const struct sock *sk, * to include this last segment in this skb. * 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; @@ -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)) 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 false; |