diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-01 21:44:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-01 21:44:29 -0500 |
| commit | 23e19fd4fb07eebf96909a86b8545bc4aa682e54 (patch) | |
| tree | 3602f4d99e853d781a38c72c1f0d2b08b90105a9 /include | |
| parent | 7797dc41417eb0e03f39fc4356f7635bcdef108e (diff) | |
| parent | 71abf467bb630c7e2f4ef33267d98fb7d10d3ce9 (diff) | |
| download | cachepc-linux-23e19fd4fb07eebf96909a86b8545bc4aa682e54.tar.gz cachepc-linux-23e19fd4fb07eebf96909a86b8545bc4aa682e54.zip | |
Merge branch 'tcp_bbr-more-GSO-work'
Eric Dumazet says:
====================
tcp_bbr: more GSO work
Playing with r8152 USB 1Gbit NIC, on both USB2 and USB3 slots, I found
that BBR was performing poorly, because of TSO being limited to 16KB
This patch series makes sure BBR is not under estimating number of
packets that are needed to fill the pipe when a device has suboptimal
TSO limits.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 92b06c6e7732..9c9b3768b350 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -511,8 +511,6 @@ __u32 cookie_v6_init_sequence(const struct sk_buff *skb, __u16 *mss); #endif /* tcp_output.c */ -u32 tcp_tso_autosize(const struct sock *sk, unsigned int mss_now, - int min_tso_segs); void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss, int nonagle); int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs); @@ -981,8 +979,8 @@ struct tcp_congestion_ops { u32 (*undo_cwnd)(struct sock *sk); /* hook for packet ack accounting (optional) */ void (*pkts_acked)(struct sock *sk, const struct ack_sample *sample); - /* suggest number of segments for each skb to transmit (optional) */ - u32 (*tso_segs_goal)(struct sock *sk); + /* override sysctl_tcp_min_tso_segs */ + u32 (*min_tso_segs)(struct sock *sk); /* returns the multiplier used in tcp_sndbuf_expand (optional) */ u32 (*sndbuf_expand)(struct sock *sk); /* call when packets are delivered to update cwnd and pacing rate, |
