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/socket.c | |
| parent | 24197ee2102359b59044234347dd3504302fa97d (diff) | |
| parent | 7494cfa6d36d1556f17baa012dd93833620783db (diff) | |
| download | linux-6851cf28db1c4becc25a2906ecd080c0022a9f11.tar.gz linux-6851cf28db1c4becc25a2906ecd080c0022a9f11.tar.xz | |
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/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 275b666f6231..3e5eba30865e 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2634,12 +2634,12 @@ static int tipc_sk_withdraw(struct tipc_sock *tsk, uint scope, if (publ->upper != seq->upper) break; tipc_nametbl_withdraw(net, publ->type, publ->lower, - publ->port, publ->key); + publ->upper, publ->key); rc = 0; break; } tipc_nametbl_withdraw(net, publ->type, publ->lower, - publ->port, publ->key); + publ->upper, publ->key); rc = 0; } if (list_empty(&tsk->publications)) |