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 <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 5ad70eff1ebf95cab1fdf05d04c1e43129c7b920..d696f9e414e34ef4ef9798d4bfc143eef4f4e892 100644 (file)
--- 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 413b33742a991f2fd691a4563937852a675ed18c..e728d4ce2a1b4bd10aa1ff375fef4a5e7b5634a9 100644 (file)
--- 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