Merge branch 'tcp_nv'
authorDavid S. Miller <davem@davemloft.net>
Sat, 11 Jun 2016 06:07:50 +0000 (23:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Jun 2016 06:07:50 +0000 (23:07 -0700)
commitf6664f1f63404b75b8a980ae03b2a945337d07e1
treef43744c64fd040388ab6c55c3edaa186654ad21b
parent3e7fb80b604b5bc7116fe374f604eb7c85f00b43
parent699fafafab6d765f12367b3ce0816e64ae19d1e8
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>