tipc: make tipc node address support net namespace

If net namespace is supported in tipc, each namespace will be treated
as a separate tipc node. Therefore, every namespace must own its
private tipc node address. This means the "tipc_own_addr" global
variable of node address must be moved to tipc_net structure to
satisfy the requirement. It's turned out that users also can assign
node address for every namespace.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Tested-by: Tero Aho <Tero.Aho@coriant.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index f93dd3dd621b..786411dea61c 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -86,7 +86,7 @@ static void tipc_disc_init_msg(struct net *net, struct sk_buff *buf, u32 type,
         u32 dest_domain = b_ptr->domain;
 
         msg = buf_msg(buf);
-        tipc_msg_init(msg, LINK_CONFIG, type, INT_H_SIZE, dest_domain);
+        tipc_msg_init(net, msg, LINK_CONFIG, type, INT_H_SIZE, dest_domain);
         msg_set_non_seq(msg, 1);
         msg_set_node_sig(msg, tipc_random);
         msg_set_dest_domain(msg, dest_domain);
@@ -153,12 +153,12 @@ void tipc_disc_rcv(struct net *net, struct sk_buff *buf,
         if (!tipc_addr_node_valid(onode))
                 return;
 
-        if (in_own_node(onode)) {
+        if (in_own_node(net, onode)) {
                 if (memcmp(&maddr, &bearer->addr, sizeof(maddr)))
-                        disc_dupl_alert(bearer, tipc_own_addr, &maddr);
+                        disc_dupl_alert(bearer, tn->own_addr, &maddr);
                 return;
         }
-        if (!tipc_in_scope(ddom, tipc_own_addr))
+        if (!tipc_in_scope(ddom, tn->own_addr))
                 return;
         if (!tipc_in_scope(bearer->domain, onode))
                 return;