Commit 8f92df6a authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

tipc: Remove prototype code for supporting multiple clusters 



Eliminates routines, data structures, and files that were intended
to allow TIPC to support a network containing multiple clusters.
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 51a8e4de

include/linux/tipc_config.h

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
#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    /* obsoleted */

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

#define  TIPC_CMD_GET_MAX_CLUSTERS  0x4008    /* obsoleted */

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

#define  TIPC_CMD_GET_MAX_SLAVES    0x400A    /* obsoleted */

#define  TIPC_CMD_GET_NETID         0x400B    /* tx none, rx unsigned */
@@ -131,7 +131,7 @@ 
#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    /* obsoleted */

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

#define  TIPC_CMD_SET_MAX_CLUSTERS  0x8008    /* obsoleted */

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

#define  TIPC_CMD_SET_MAX_SLAVES    0x800A    /* obsoleted */

#define  TIPC_CMD_SET_NETID         0x800B    /* tx unsigned, rx none */

net/tipc/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -29,16 +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_CLUSTERS

	int "Maximum number of clusters in a zone"

	depends on TIPC_ADVANCED

	range 1 1

	default "1"

	help

	  Specifies how many clusters can be supported in a TIPC zone.



	  *** Currently TIPC only supports a single cluster per zone. ***



config TIPC_NODES

	int "Maximum number of nodes in a cluster"

	depends on TIPC_ADVANCED

net/tipc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


obj-$(CONFIG_TIPC) := tipc.o



tipc-y	+= addr.o bcast.o bearer.o config.o cluster.o \

tipc-y	+= addr.o bcast.o bearer.o config.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  \

net/tipc/addr.c

+2 −3
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 
 */



#include "core.h"

#include "cluster.h"

#include "node.h"

#include "addr.h"



/**

 * tipc_addr_domain_valid - validates a network domain address
@@ -55,8 +56,6 @@ int tipc_addr_domain_valid(u32 addr) 


	if (n > max_nodes)

		return 0;

	if (c > tipc_max_clusters)

		return 0;



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

		return 0;

net/tipc/bcast.c

+6 −3
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ static struct bclink *bclink = NULL; 
static struct link *bcl = NULL;

static DEFINE_SPINLOCK(bc_lock);



/* broadcast-capable node map */

struct tipc_node_map tipc_bcast_nmap;



const char tipc_bclink_name[] = "broadcast-link";



static void tipc_nmap_diff(struct tipc_node_map *nm_a,
@@ -566,8 +569,8 @@ static int tipc_bcbearer_send(struct sk_buff *buf, 
	if (likely(!msg_non_seq(buf_msg(buf)))) {

		struct tipc_msg *msg;



		assert(tipc_cltr_bcast_nodes.count != 0);

		bcbuf_set_acks(buf, tipc_cltr_bcast_nodes.count);

		assert(tipc_bcast_nmap.count != 0);

		bcbuf_set_acks(buf, tipc_bcast_nmap.count);

		msg = buf_msg(buf);

		msg_set_non_seq(msg, 1);

		msg_set_mc_netid(msg, tipc_net_id);
@@ -576,7 +579,7 @@ static int tipc_bcbearer_send(struct sk_buff *buf, 


	/* Send buffer over bearers until all targets reached */



	bcbearer->remains = tipc_cltr_bcast_nodes;

	bcbearer->remains = tipc_bcast_nmap;



	for (bp_index = 0; bp_index < MAX_BEARERS; bp_index++) {

		struct bearer *p = bcbearer->bpairs[bp_index].primary;

CRA Git | Maintained and supported by SUSTech CRA and CCSE