diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-01-05 22:55:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-05 22:55:28 -0500 |
| commit | a918eb9fac6431901fe8ec8a2cb31dfe6fdd1af7 (patch) | |
| tree | 3b4de2d4483e984a20640aa9f42681aebb6b955e /drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | |
| parent | net: Do not call ndo_dflt_fdb_dump if ndo_fdb_dump is defined (diff) | |
| parent | net: tcp: add per route congestion control (diff) | |
| download | linux-dev-a918eb9fac6431901fe8ec8a2cb31dfe6fdd1af7.tar.xz linux-dev-a918eb9fac6431901fe8ec8a2cb31dfe6fdd1af7.zip | |
Merge branch 'rt_cong_ctrl'
Daniel Borkmann says:
====================
net: allow setting congctl via routing table
This is the second part of our work and allows for setting the congestion
control algorithm via routing table. For details, please see individual
patches.
Since patch 1 is a bug fix, we suggest applying patch 1 to net, and then
merging net into net-next, for example, and following up with the remaining
feature patches wrt dependencies.
Joint work with Florian Westphal, suggested by Hannes Frederic Sowa.
Patch for iproute2 is available under [1], but will be reposted with along
with the man-page update when this set hits net-next.
[1] http://patchwork.ozlabs.org/patch/418149/
Thanks!
v2 -> v3:
- Added module auto-loading as suggested by David Miller, thanks!
- Added patch 2 for handling possible sleeps in fib6
- While working on this, we discovered a bug, hence fix in patch 1
- Added auto-loading to patch 4
- Rebased, retested, rest the same.
v1 -> v2:
- Very sorry, I noticed I had decnet disabled during testing.
Added missing header include in decnet, rest as is.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions