diff options
author | Greg Kroah-Hartman | 2019-04-21 23:18:44 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2019-04-21 23:18:44 +0200 |
commit | 817de6b85914a3dda72b971c074d4d342965fba0 (patch) | |
tree | df0a4563a04aadb8f8595f72392d66d65797c455 /net/tipc/name_table.c | |
parent | staging: kpc2000: add initial set of Daktronics drivers (diff) | |
parent | Linux 5.1-rc6 (diff) | |
download | kernel-qcow2-linux-817de6b85914a3dda72b971c074d4d342965fba0.tar.gz kernel-qcow2-linux-817de6b85914a3dda72b971c074d4d342965fba0.tar.xz kernel-qcow2-linux-817de6b85914a3dda72b971c074d4d342965fba0.zip |
Merge 5.1-rc6 into staging-next
We want the fixes in here as well as this resolves an iio driver merge
issue.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/tipc/name_table.c')
-rw-r--r-- | net/tipc/name_table.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index bff241f03525..89993afe0fbd 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c @@ -909,7 +909,8 @@ static int tipc_nl_service_list(struct net *net, struct tipc_nl_msg *msg, for (; i < TIPC_NAMETBL_SIZE; i++) { head = &tn->nametbl->services[i]; - if (*last_type) { + if (*last_type || + (!i && *last_key && (*last_lower == *last_key))) { service = tipc_service_find(net, *last_type); if (!service) return -EPIPE; |