diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-31 22:19:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-31 22:19:59 -0400 |
| commit | 6851cf28db1c4becc25a2906ecd080c0022a9f11 (patch) | |
| tree | c1905f23eaf0b2aeb7195a78ca378bcb94414251 /net/tipc/net.c | |
| parent | 24197ee2102359b59044234347dd3504302fa97d (diff) | |
| parent | 7494cfa6d36d1556f17baa012dd93833620783db (diff) | |
Merge branch 'tipc-slim-down-name-table'
Jon Maloy says:
====================
tipc: slim down name table
We clean up and improve the name binding table:
- Replace the memory consuming 'sub_sequence/service range' array with
an RB tree.
- Introduce support for overlapping service sequences/ranges
v2: #1: Fixed a missing initialization reported by David Miller
#4: Obsoleted and replaced a few more macros to get a consistent
terminology in the API.
#5: Added new commit to fix a potential string overflow bug (it
is still only in net-next) reported by Arnd Bergmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/net.c')
| -rw-r--r-- | net/tipc/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index 29538dc00857..856f9e97ea29 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -136,7 +136,7 @@ void tipc_net_stop(struct net *net) if (!self) return; - tipc_nametbl_withdraw(net, TIPC_CFG_SRV, self, 0, self); + tipc_nametbl_withdraw(net, TIPC_CFG_SRV, self, self, self); rtnl_lock(); tipc_bearer_stop(net); tipc_node_stop(net); |