tipc: involve namespace infrastructure

Involve namespace infrastructure, make the "tipc_net_id" global
variable aware of per namespace, and rename it to "net_id". In
order that the conversion can be successfully done, an instance
of networking namespace must be passed to relevant functions,
allowing them to access the "net_id" variable of per 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, 6 insertions, 4 deletions

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index b891e3905bc4..282b59681484 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -46,6 +46,7 @@
 
 static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
 {
+        struct net *net = genl_info_net(info);
         struct sk_buff *rep_buf;
         struct nlmsghdr *rep_nlh;
         struct nlmsghdr *req_nlh = info->nlhdr;
@@ -58,10 +59,11 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
         else
                 cmd = req_userhdr->cmd;
 
-        rep_buf = tipc_cfg_do_cmd(req_userhdr->dest, cmd,
-                        nlmsg_data(req_nlh) + GENL_HDRLEN + TIPC_GENL_HDRLEN,
-                        nlmsg_attrlen(req_nlh, GENL_HDRLEN + TIPC_GENL_HDRLEN),
-                        hdr_space);
+        rep_buf = tipc_cfg_do_cmd(net, req_userhdr->dest, cmd,
+                                  nlmsg_data(req_nlh) + GENL_HDRLEN +
+                                  TIPC_GENL_HDRLEN,
+                                  nlmsg_attrlen(req_nlh, GENL_HDRLEN +
+                                  TIPC_GENL_HDRLEN), hdr_space);
 
         if (rep_buf) {
                 skb_push(rep_buf, hdr_space);