tipc: fix test of bearer_priority range in tipc_register_media()

PATCH Applied Roel Kluin 2 participants 2 messages Aug 27, 2009 – Aug 29, 2009

Subsystems (3)

Networking Network drivers TIPC network layer

lore

Share & tools

lore

Roel Kluin

author

2009-08-27 11:57 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

net/tipc/bearer.c +1 -1

index a7a3677..327011f 100644
@@ -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);

David Miller

maintainer Applied

2009-08-29 07:21 UTC #1 lore raw

From: Roel Kluin <[email protected]>
Date: Thu, 27 Aug 2009 14:03:15 +0200

Quoted 4 lines

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 <[email protected]>

Applied to net-next-2.6, thanks.