From 3e028f05e25974cddd5938fbd4495d39b0dd0d3e Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Fri, 27 May 2011 15:09:40 -0400 Subject: [PATCH] --- yaml --- r: 266116 b: refs/heads/master c: 909234cdd2b5954374e346c105b648f6c2800f55 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/tipc/bearer.h | 4 ++-- trunk/net/tipc/eth_media.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 10bec06d050c..0cc89f7f26e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18abf0fb6b8f05be2a289abbbc054d4869281476 +refs/heads/master: 909234cdd2b5954374e346c105b648f6c2800f55 diff --git a/trunk/net/tipc/bearer.h b/trunk/net/tipc/bearer.h index 5ad70eff1ebf..d696f9e414e3 100644 --- a/trunk/net/tipc/bearer.h +++ b/trunk/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/trunk/net/tipc/eth_media.c b/trunk/net/tipc/eth_media.c index 413b33742a99..e728d4ce2a1b 100644 --- a/trunk/net/tipc/eth_media.c +++ b/trunk/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