summaryrefslogtreecommitdiff
path: root/net/tipc/net.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-12-11 23:44:49 +0300
committerMark Brown <broonie@kernel.org>2018-12-11 23:44:49 +0300
commite6202e8249aa7115af65f2d80b43c132816224ef (patch)
tree8865dd722ad55bb5e6bd5d446057395336ed0169 /net/tipc/net.h
parent2b96edb570709d6ca2e06842941c4bdf04b55f47 (diff)
parentd407c81adae57041ba82577e604e351f36b8afce (diff)
downloadlinux-e6202e8249aa7115af65f2d80b43c132816224ef.tar.xz
Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-4.21
Diffstat (limited to 'net/tipc/net.h')
-rw-r--r--net/tipc/net.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/net.h b/net/tipc/net.h
index 09ad02b50bb1..b7f2e364eb99 100644
--- a/net/tipc/net.h
+++ b/net/tipc/net.h
@@ -42,7 +42,7 @@
extern const struct nla_policy tipc_nl_net_policy[];
int tipc_net_init(struct net *net, u8 *node_id, u32 addr);
-void tipc_net_finalize(struct net *net, u32 addr);
+void tipc_sched_net_finalize(struct net *net, u32 addr);
void tipc_net_stop(struct net *net);
int tipc_nl_net_dump(struct sk_buff *skb, struct netlink_callback *cb);
int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info);