From: Allan Stephens Date: Fri, 27 May 2011 19:09:40 +0000 (-0400) Subject: tipc: Lower limits for number of bearers and media types X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=909234cdd2b5954374e346c105b648f6c2800f55;p=mv-sheeva.git tipc: Lower limits for number of bearers and media types Reduces the number of bearers a node can support to 2, which can use identical or non-identical media. This change won't impact users, since they are currently limited to a maximum of 2 Ethernet bearers, and will save memory by eliminating a number of unused entries in TIPC's media and bearer arrays. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker --- diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index 5ad70eff1eb..d696f9e414e 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h @@ -39,8 +39,8 @@ #include "bcast.h" -#define MAX_BEARERS 8 -#define MAX_MEDIA 4 +#define MAX_BEARERS 2 +#define MAX_MEDIA 2 /* * Identifiers of supported TIPC media types diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index 413b33742a9..e728d4ce2a1 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c @@ -37,7 +37,7 @@ #include "core.h" #include "bearer.h" -#define MAX_ETH_BEARERS 2 +#define MAX_ETH_BEARERS MAX_BEARERS #define ETH_LINK_PRIORITY TIPC_DEF_LINK_PRI #define ETH_LINK_TOLERANCE TIPC_DEF_LINK_TOL #define ETH_LINK_WINDOW TIPC_DEF_LINK_WIN