diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-10 23:07:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-10 23:07:50 -0700 |
| commit | f6664f1f63404b75b8a980ae03b2a945337d07e1 (patch) | |
| tree | f43744c64fd040388ab6c55c3edaa186654ad21b /net/ipv4/Makefile | |
| parent | 3e7fb80b604b5bc7116fe374f604eb7c85f00b43 (diff) | |
| parent | 699fafafab6d765f12367b3ce0816e64ae19d1e8 (diff) | |
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 'net/ipv4/Makefile')
| -rw-r--r-- | net/ipv4/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile index bfa133691cde..24629b6f57cc 100644 --- a/net/ipv4/Makefile +++ b/net/ipv4/Makefile @@ -50,6 +50,7 @@ obj-$(CONFIG_TCP_CONG_HSTCP) += tcp_highspeed.o obj-$(CONFIG_TCP_CONG_HYBLA) += tcp_hybla.o obj-$(CONFIG_TCP_CONG_HTCP) += tcp_htcp.o obj-$(CONFIG_TCP_CONG_VEGAS) += tcp_vegas.o +obj-$(CONFIG_TCP_CONG_NV) += tcp_nv.o obj-$(CONFIG_TCP_CONG_VENO) += tcp_veno.o obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o |