diff options
author | David S. Miller <davem@davemloft.net> | 2019-12-11 04:31:15 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-12-11 04:31:15 +0300 |
commit | bb9d8454bb0fed028558d1e66b12d50db5e43e06 (patch) | |
tree | 0158a019a37761b131b5bb2615409dff904bc28f /net/tipc/bcast.c | |
parent | 08cbc75f96029d3092664213a844a5e25523aa35 (diff) | |
parent | 16ad3f4022bb53c7541a0bf0410b32d0231ebef9 (diff) | |
download | linux-bb9d8454bb0fed028558d1e66b12d50db5e43e06.tar.xz |
Merge branch 'tipc-introduce-variable-window-congestion-control'
Jon Maloy says:
====================
tipc: introduce variable window congestion control
We improve thoughput greatly by introducing a variety of the Reno
congestion control algorithm at the link level.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/bcast.c')
-rw-r--r-- | net/tipc/bcast.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 55aeba681cf4..42e01e9cf893 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -562,18 +562,18 @@ int tipc_bclink_reset_stats(struct net *net) return 0; } -static int tipc_bc_link_set_queue_limits(struct net *net, u32 limit) +static int tipc_bc_link_set_queue_limits(struct net *net, u32 max_win) { struct tipc_link *l = tipc_bc_sndlink(net); if (!l) return -ENOPROTOOPT; - if (limit < BCLINK_WIN_MIN) - limit = BCLINK_WIN_MIN; - if (limit > TIPC_MAX_LINK_WIN) + if (max_win < BCLINK_WIN_MIN) + max_win = BCLINK_WIN_MIN; + if (max_win > TIPC_MAX_LINK_WIN) return -EINVAL; tipc_bcast_lock(net); - tipc_link_set_queue_limits(l, limit); + tipc_link_set_queue_limits(l, BCLINK_WIN_MIN, max_win); tipc_bcast_unlock(net); return 0; } @@ -683,6 +683,7 @@ int tipc_bcast_init(struct net *net) if (!tipc_link_bc_create(net, 0, 0, FB_MTU, BCLINK_WIN_DEFAULT, + BCLINK_WIN_DEFAULT, 0, &bb->inputq, NULL, |