From: Allan Stephens <allan.stephens@windriver.com>
Date: Wed, 25 May 2011 17:28:27 +0000 (-0400)
Subject: tipc: Eliminate redundant masking in message header routines
X-Git-Tag: v3.1-rc1~316^2~349^2~12
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=7eb878ed8e0eae67269439bfd82234f9ba52ffe4;p=cascardo%2Flinux.git

tipc: Eliminate redundant masking in message header routines

Gets rid of unnecessary masking in two routines that set TIPC message
header fields. (The msg_set_bits() routine already takes care of
masking the new value to the correct size.)

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 11b74dc253f5..a58975ced222 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -615,7 +615,7 @@ static inline u32 msg_link_selector(struct tipc_msg *m)
 
 static inline void msg_set_link_selector(struct tipc_msg *m, u32 n)
 {
-	msg_set_bits(m, 4, 0, 1, (n & 1));
+	msg_set_bits(m, 4, 0, 1, n);
 }
 
 /*
@@ -639,7 +639,7 @@ static inline u32 msg_probe(struct tipc_msg *m)
 
 static inline void msg_set_probe(struct tipc_msg *m, u32 val)
 {
-	msg_set_bits(m, 5, 0, 1, (val & 1));
+	msg_set_bits(m, 5, 0, 1, val);
 }
 
 static inline char msg_net_plane(struct tipc_msg *m)