Merge tag 'for-linus-20150216' of git://git.infradead.org/linux-mtd

[karo-tx-linux.git] / net / tipc / net.h

diff --git a/net/tipc/net.h b/net/tipc/net.h
index a81c1b9eb150630706a807679d841afaa837cec3..77a7a118911d1b4f6b21dacee9795d2ca657c319 100644 (file)
--- a/net/tipc/net.h
+++ b/net/tipc/net.h
@@ -39,9 +39,9 @@
 
 #include <net/genetlink.h>
 
-int tipc_net_start(u32 addr);
+int tipc_net_start(struct net *net, u32 addr);
 
-void tipc_net_stop(void);
+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);