[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1415986399-23874-1-git-send-email-holger.brunck@keymile.com>
Date: Fri, 14 Nov 2014 18:33:19 +0100
From: Holger Brunck <holger.brunck@...mile.com>
To: davem@...emloft.net
Cc: jon.maloy@...csson.com, Holger Brunck <holger.brunck@...mile.com>,
Ying Xue <ying.xue@...driver.com>,
Erik Hugne <erik.hugne@...csson.com>, netdev@...r.kernel.org
Subject: [PATCH net-next] 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@...mile.com>
Reviewed-By: Jon Maloy <jon.maloy@...csson.com>
cc: Ying Xue <ying.xue@...driver.com>
cc: Erik Hugne <erik.hugne@...csson.com>
cc: netdev@...r.kernel.org
---
net/tipc/link.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 1db162a..7cf8004 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -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;
}
--
2.1.2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists