Commit 51f98a8d authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

tipc: Remove prototype code for supporting multiple zones 



Eliminates routines, data structures, and files that were intended
to allows TIPC to support a network containing multiple zones.
Currently, TIPC supports only networks consisting of a single cluster
within a single zone, so this code is unnecessary.

Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa6027ca

include/linux/tipc_config.h

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
#define  TIPC_CMD_GET_MAX_PORTS     0x4004    /* tx none, rx unsigned */

#define  TIPC_CMD_GET_MAX_PUBL      0x4005    /* tx none, rx unsigned */

#define  TIPC_CMD_GET_MAX_SUBSCR    0x4006    /* tx none, rx unsigned */

#define  TIPC_CMD_GET_MAX_ZONES     0x4007    /* tx none, rx unsigned */

#define  TIPC_CMD_GET_MAX_ZONES     0x4007    /* obsoleted */

#define  TIPC_CMD_GET_MAX_CLUSTERS  0x4008    /* tx none, rx unsigned */

#define  TIPC_CMD_GET_MAX_NODES     0x4009    /* tx none, rx unsigned */

#define  TIPC_CMD_GET_MAX_SLAVES    0x400A    /* tx none, rx unsigned */
@@ -130,7 +130,7 @@ 
#define  TIPC_CMD_SET_MAX_PORTS     0x8004    /* tx unsigned, rx none */

#define  TIPC_CMD_SET_MAX_PUBL      0x8005    /* tx unsigned, rx none */

#define  TIPC_CMD_SET_MAX_SUBSCR    0x8006    /* tx unsigned, rx none */

#define  TIPC_CMD_SET_MAX_ZONES     0x8007    /* tx unsigned, rx none */

#define  TIPC_CMD_SET_MAX_ZONES     0x8007    /* obsoleted */

#define  TIPC_CMD_SET_MAX_CLUSTERS  0x8008    /* tx unsigned, rx none */

#define  TIPC_CMD_SET_MAX_NODES     0x8009    /* tx unsigned, rx none */

#define  TIPC_CMD_SET_MAX_SLAVES    0x800A    /* tx unsigned, rx none */

net/tipc/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -29,18 +29,6 @@ config TIPC_ADVANCED 
	  Saying Y here will open some advanced configuration for TIPC.

	  Most users do not need to bother; if unsure, just say N.



config TIPC_ZONES

	int "Maximum number of zones in a network"

	depends on TIPC_ADVANCED

	range 1 255

	default "3"

	help

	  Specifies how many zones can be supported in a TIPC network.

	  Can range from 1 to 255 zones; default is 3.



	  Setting this to a smaller value saves some memory;

	  setting it to a higher value allows for more zones.



config TIPC_CLUSTERS

	int "Maximum number of clusters in a zone"

	depends on TIPC_ADVANCED

net/tipc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ tipc-y += addr.o bcast.o bearer.o config.o cluster.o \ 
	   core.o handler.o link.o discover.o msg.o  \

	   name_distr.o  subscr.o name_table.o net.o  \

	   netlink.o node.o node_subscr.o port.o ref.o  \

	   socket.o user_reg.o zone.o dbg.o eth_media.o

	   socket.o user_reg.o dbg.o eth_media.o



# End of file

net/tipc/addr.c

+0 −4
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ 
 */



#include "core.h"

#include "addr.h"

#include "zone.h"

#include "cluster.h"



/**
@@ -61,8 +59,6 @@ int tipc_addr_domain_valid(u32 addr) 
		return 0;

	if (c > tipc_max_clusters)

		return 0;

	if (z > tipc_max_zones)

		return 0;



	if (n && (!z || !c))

		return 0;

net/tipc/cluster.c

+1 −13
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ u32 tipc_highest_allowed_slave = 0; 


struct cluster *tipc_cltr_create(u32 addr)

{

	struct _zone *z_ptr;

	struct cluster *c_ptr;

	int max_nodes;
@@ -75,18 +74,7 @@ struct cluster *tipc_cltr_create(u32 addr) 
	c_ptr->highest_slave = LOWEST_SLAVE - 1;

	c_ptr->highest_node = 0;



	z_ptr = tipc_zone_find(tipc_zone(addr));

	if (!z_ptr) {

		z_ptr = tipc_zone_create(addr);

	}

	if (!z_ptr) {

		kfree(c_ptr->nodes);

		kfree(c_ptr);

		return NULL;

	}



	tipc_zone_attach_cluster(z_ptr, c_ptr);

	c_ptr->owner = z_ptr;

	tipc_net.clusters[1] = c_ptr;

	return c_ptr;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE