diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-30 05:12:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-30 05:12:05 -0700 |
| commit | 03420865e10d05d60d592fe8649e4853dc69ca5a (patch) | |
| tree | 105d173e5267931d794e429ee7c64f83e526a521 /net/tipc/monitor.c | |
| parent | a2e63709b53312002009c564460af34520c62f98 (diff) | |
| parent | 6da6c0db5316275015e8cc2959f12a17584aeb64 (diff) | |
| download | op-kernel-dev-03420865e10d05d60d592fe8649e4853dc69ca5a.zip op-kernel-dev-03420865e10d05d60d592fe8649e4853dc69ca5a.tar.gz | |
Merge 4.17-rc3 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/tipc/monitor.c')
| -rw-r--r-- | net/tipc/monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c index 32dc33a..5453e56 100644 --- a/net/tipc/monitor.c +++ b/net/tipc/monitor.c @@ -777,7 +777,7 @@ int __tipc_nl_add_monitor(struct net *net, struct tipc_nl_msg *msg, ret = tipc_bearer_get_name(net, bearer_name, bearer_id); if (ret || !mon) - return -EINVAL; + return 0; hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family, NLM_F_MULTI, TIPC_NL_MON_GET); |
