diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-11 09:07:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-11 09:07:50 +0300 |
| commit | f6664f1f63404b75b8a980ae03b2a945337d07e1 (patch) | |
| tree | f43744c64fd040388ab6c55c3edaa186654ad21b /include | |
| parent | 3e7fb80b604b5bc7116fe374f604eb7c85f00b43 (diff) | |
| parent | 699fafafab6d765f12367b3ce0816e64ae19d1e8 (diff) | |
| download | linux-f6664f1f63404b75b8a980ae03b2a945337d07e1.tar.xz | |
Merge branch 'tcp_nv'
Lawrence Brakmo says:
====================
tcp: add NV congestion control
Removed most of the module parameters
Tested in a rack using between 1 and 380 active TCP-NV flows.
Consists of the following patches:
[PATCH net-next v2 1/2] tcp: add in_flight to tcp_skb_cb
[PATCH net-next v2 2/2] tcp: add NV congestion control
====================
Signed-off-by: Lawrence Brakmo <brakmo@fb.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 0bcc70f4e1fb..a79894b66726 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -767,6 +767,7 @@ struct tcp_skb_cb { union { struct { /* There is space for up to 20 bytes */ + __u32 in_flight;/* Bytes in flight when packet sent */ } tx; /* only used for outgoing skbs */ union { struct inet_skb_parm h4; @@ -859,6 +860,7 @@ union tcp_cc_info; struct ack_sample { u32 pkts_acked; s32 rtt_us; + u32 in_flight; }; struct tcp_congestion_ops { |