tipc: make msg_set_redundant_link() consistent with other set ops

All the other boolean like msg_set_X(m) operations don't
export both a msg_set_X(a) and a msg_clear_X(m), but instead
just have the single msg_set_X(m, val) variant.

Make the redundant_link one consistent by having the set take
a value, and delete the msg_clear_redundant_link() anomoly.
This is a cosmetic change and should not change behaviour.

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

diff --git a/net/tipc/link.c b/net/tipc/link.c
index d8a4b90b029c15353d5ab0f5239443bd5e8a11c4..6ffae0e8809e5dc875a3c381b5109d14a0996ded 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1954,10 +1954,7 @@ void tipc_link_send_proto_msg(struct link *l_ptr, u32 msg_typ, int probe_msg,
                msg_set_max_pkt(msg, l_ptr->max_pkt_target);
        }
 
-       if (tipc_node_redundant_links(l_ptr->owner))
-               msg_set_redundant_link(msg);
-       else
-               msg_clear_redundant_link(msg);
+       msg_set_redundant_link(msg, tipc_node_redundant_links(l_ptr->owner));
        msg_set_linkprio(msg, l_ptr->priority);
 
        /* Ensure sequence number will not fit : */

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 6948d3dbab0b2943d8e216ee888c035e0d37c8c5..bea0126cb676bf1b86c3441c305122113a26b1e6 100644 (file)
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -719,14 +719,9 @@ static inline u32 msg_redundant_link(struct tipc_msg *m)
        return msg_bits(m, 5, 12, 0x1);
 }
 
-static inline void msg_set_redundant_link(struct tipc_msg *m)
+static inline void msg_set_redundant_link(struct tipc_msg *m, u32 r)
 {
-       msg_set_bits(m, 5, 12, 0x1, 1);
-}
-
-static inline void msg_clear_redundant_link(struct tipc_msg *m)
-{
-       msg_set_bits(m, 5, 12, 0x1, 0);
+       msg_set_bits(m, 5, 12, 0x1, r);
 }