Commit 0372bf5c authored Nov 14, 2014 by Holger Brunck Committed by David S. Miller Nov 16, 2014

tipc: allow one link per bearer to neighboring nodes



There is no reason to limit the amount of possible links to a
neighboring node to 2. If we have more then two bearers we can also
establish more links.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Reviewed-By: Jon Maloy <jon.maloy@ericsson.com>
cc: Ying Xue <ying.xue@windriver.com>
cc: Erik Hugne <erik.hugne@ericsson.com>
cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a77f9c5d

net/tipc/link.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -224,9 +224,10 @@ struct tipc_link tipc_link_create(struct tipc_node n_ptr,
		char addr_string[16];
		u32 peer = n_ptr->addr;

		if (n_ptr->link_cnt >= 2) {
		if (n_ptr->link_cnt >= MAX_BEARERS) {
		tipc_addr_string_fill(addr_string, n_ptr->addr);
		pr_err("Attempt to establish third link to %s\n", addr_string);
		pr_err("Attempt to establish %uth link to %s. Max %u allowed.\n",
		n_ptr->link_cnt, addr_string, MAX_BEARERS);
		return NULL;
		}

Admin message