aboutsummaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
authorroel kluin <roel.kluin@gmail.com>2009-08-27 02:03:15 +0000
committerDavid S. Miller <davem@davemloft.net>2009-08-29 00:19:42 -0700
commitb3df9a514f3c2020952cff34bc5bc6694a31c00c (patch)
tree9d71fb739f4f9a3ae381855a5dd9365b797e6b22 /net/tipc
parentea00b8e2223170a842bee06e0f27754ccdf2a217 (diff)
downloadlinux-2.6.34-ux500-b3df9a514f3c2020952cff34bc5bc6694a31c00c.tar.gz
tipc: fix test of bearer_priority range in tipc_register_media()
For the bearer_priority to be less than TIPC_MIN_LINK_PRI and greater than TIPC_MAX_LINK_PRI is logically impossible. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/bearer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index a7a36779b9b..327011fcc40 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -119,7 +119,7 @@ int tipc_register_media(u32 media_type,
warn("Media <%s> rejected, no broadcast address\n", name);
goto exit;
}
- if ((bearer_priority < TIPC_MIN_LINK_PRI) &&
+ if ((bearer_priority < TIPC_MIN_LINK_PRI) ||
(bearer_priority > TIPC_MAX_LINK_PRI)) {
warn("Media <%s> rejected, illegal priority (%u)\n", name,
bearer_priority);