1 files changed, 40 insertions, 50 deletions

diff --git a/net/tipc/config.c b/net/tipc/config.c
index 876f4c6a2631..6873360cda53 100644
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -134,7 +134,7 @@ static struct sk_buff *tipc_show_stats(void)
         return buf;
 }
 
-static struct sk_buff *cfg_enable_bearer(void)
+static struct sk_buff *cfg_enable_bearer(struct net *net)
 {
         struct tipc_bearer_config *args;
 
@@ -142,7 +142,7 @@ static struct sk_buff *cfg_enable_bearer(void)
                 return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
 
         args = (struct tipc_bearer_config *)TLV_DATA(req_tlv_area);
-        if (tipc_enable_bearer(args->name,
+        if (tipc_enable_bearer(net, args->name,
                                ntohl(args->disc_domain),
                                ntohl(args->priority)))
                 return tipc_cfg_reply_error_string("unable to enable bearer");
@@ -150,78 +150,66 @@ static struct sk_buff *cfg_enable_bearer(void)
         return tipc_cfg_reply_none();
 }
 
-static struct sk_buff *cfg_disable_bearer(void)
+static struct sk_buff *cfg_disable_bearer(struct net *net)
 {
         if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_BEARER_NAME))
                 return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
 
-        if (tipc_disable_bearer((char *)TLV_DATA(req_tlv_area)))
+        if (tipc_disable_bearer(net, (char *)TLV_DATA(req_tlv_area)))
                 return tipc_cfg_reply_error_string("unable to disable bearer");
 
         return tipc_cfg_reply_none();
 }
 
-static struct sk_buff *cfg_set_own_addr(void)
+static struct sk_buff *cfg_set_own_addr(struct net *net)
 {
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
         u32 addr;
 
         if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR))
                 return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
 
         addr = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
-        if (addr == tipc_own_addr)
+        if (addr == tn->own_addr)
                 return tipc_cfg_reply_none();
         if (!tipc_addr_node_valid(addr))
                 return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
                                                    " (node address)");
-        if (tipc_own_addr)
+        if (tn->own_addr)
                 return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
                                                    " (cannot change node address once assigned)");
-        if (!tipc_net_start(addr))
+        if (!tipc_net_start(net, addr))
                 return tipc_cfg_reply_none();
 
         return tipc_cfg_reply_error_string("cannot change to network mode");
 }
 
-static struct sk_buff *cfg_set_max_ports(void)
+static struct sk_buff *cfg_set_netid(struct net *net)
 {
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
         u32 value;
 
         if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
                 return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
         value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
-        if (value == tipc_max_ports)
-                return tipc_cfg_reply_none();
-        if (value < 127 || value > 65535)
-                return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
-                                                   " (max ports must be 127-65535)");
-        return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
-                " (cannot change max ports while TIPC is active)");
-}
-
-static struct sk_buff *cfg_set_netid(void)
-{
-        u32 value;
-
-        if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
-                return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
-        value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
-        if (value == tipc_net_id)
+        if (value == tn->net_id)
                 return tipc_cfg_reply_none();
         if (value < 1 || value > 9999)
                 return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
                                                    " (network id must be 1-9999)");
-        if (tipc_own_addr)
+        if (tn->own_addr)
                 return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
                         " (cannot change network id once TIPC has joined a network)");
-        tipc_net_id = value;
+        tn->net_id = value;
         return tipc_cfg_reply_none();
 }
 
-struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area,
-                                int request_space, int reply_headroom)
+struct sk_buff *tipc_cfg_do_cmd(struct net *net, u32 orig_node, u16 cmd,
+                                const void *request_area, int request_space,
+                                int reply_headroom)
 {
         struct sk_buff *rep_tlv_buf;
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
 
         rtnl_lock();
 
@@ -231,7 +219,7 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area
         rep_headroom = reply_headroom;
 
         /* Check command authorization */
-        if (likely(in_own_node(orig_node))) {
+        if (likely(in_own_node(net, orig_node))) {
                 /* command is permitted */
         } else {
                 rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
@@ -245,28 +233,33 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area
                 rep_tlv_buf = tipc_cfg_reply_none();
                 break;
         case TIPC_CMD_GET_NODES:
-                rep_tlv_buf = tipc_node_get_nodes(req_tlv_area, req_tlv_space);
+                rep_tlv_buf = tipc_node_get_nodes(net, req_tlv_area,
+                                                  req_tlv_space);
                 break;
         case TIPC_CMD_GET_LINKS:
-                rep_tlv_buf = tipc_node_get_links(req_tlv_area, req_tlv_space);
+                rep_tlv_buf = tipc_node_get_links(net, req_tlv_area,
+                                                  req_tlv_space);
                 break;
         case TIPC_CMD_SHOW_LINK_STATS:
-                rep_tlv_buf = tipc_link_cmd_show_stats(req_tlv_area, req_tlv_space);
+                rep_tlv_buf = tipc_link_cmd_show_stats(net, req_tlv_area,
+                                                       req_tlv_space);
                 break;
         case TIPC_CMD_RESET_LINK_STATS:
-                rep_tlv_buf = tipc_link_cmd_reset_stats(req_tlv_area, req_tlv_space);
+                rep_tlv_buf = tipc_link_cmd_reset_stats(net, req_tlv_area,
+                                                        req_tlv_space);
                 break;
         case TIPC_CMD_SHOW_NAME_TABLE:
-                rep_tlv_buf = tipc_nametbl_get(req_tlv_area, req_tlv_space);
+                rep_tlv_buf = tipc_nametbl_get(net, req_tlv_area,
+                                               req_tlv_space);
                 break;
         case TIPC_CMD_GET_BEARER_NAMES:
-                rep_tlv_buf = tipc_bearer_get_names();
+                rep_tlv_buf = tipc_bearer_get_names(net);
                 break;
         case TIPC_CMD_GET_MEDIA_NAMES:
                 rep_tlv_buf = tipc_media_get_names();
                 break;
         case TIPC_CMD_SHOW_PORTS:
-                rep_tlv_buf = tipc_sk_socks_show();
+                rep_tlv_buf = tipc_sk_socks_show(net);
                 break;
         case TIPC_CMD_SHOW_STATS:
                 rep_tlv_buf = tipc_show_stats();
@@ -274,28 +267,23 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area
         case TIPC_CMD_SET_LINK_TOL:
         case TIPC_CMD_SET_LINK_PRI:
         case TIPC_CMD_SET_LINK_WINDOW:
-                rep_tlv_buf = tipc_link_cmd_config(req_tlv_area, req_tlv_space, cmd);
+                rep_tlv_buf = tipc_link_cmd_config(net, req_tlv_area,
+                                                   req_tlv_space, cmd);
                 break;
         case TIPC_CMD_ENABLE_BEARER:
-                rep_tlv_buf = cfg_enable_bearer();
+                rep_tlv_buf = cfg_enable_bearer(net);
                 break;
         case TIPC_CMD_DISABLE_BEARER:
-                rep_tlv_buf = cfg_disable_bearer();
+                rep_tlv_buf = cfg_disable_bearer(net);
                 break;
         case TIPC_CMD_SET_NODE_ADDR:
-                rep_tlv_buf = cfg_set_own_addr();
-                break;
-        case TIPC_CMD_SET_MAX_PORTS:
-                rep_tlv_buf = cfg_set_max_ports();
+                rep_tlv_buf = cfg_set_own_addr(net);
                 break;
         case TIPC_CMD_SET_NETID:
-                rep_tlv_buf = cfg_set_netid();
-                break;
-        case TIPC_CMD_GET_MAX_PORTS:
-                rep_tlv_buf = tipc_cfg_reply_unsigned(tipc_max_ports);
+                rep_tlv_buf = cfg_set_netid(net);
                 break;
         case TIPC_CMD_GET_NETID:
-                rep_tlv_buf = tipc_cfg_reply_unsigned(tipc_net_id);
+                rep_tlv_buf = tipc_cfg_reply_unsigned(tn->net_id);
                 break;
         case TIPC_CMD_NOT_NET_ADMIN:
                 rep_tlv_buf =
@@ -317,6 +305,8 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *request_area
         case TIPC_CMD_SET_REMOTE_MNG:
         case TIPC_CMD_GET_REMOTE_MNG:
         case TIPC_CMD_DUMP_LOG:
+        case TIPC_CMD_SET_MAX_PORTS:
+        case TIPC_CMD_GET_MAX_PORTS:
                 rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
                                                           " (obsolete command)");
                 break;