Commit 77f167fc authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker

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: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 8f19afb2
...@@ -1954,10 +1954,7 @@ void tipc_link_send_proto_msg(struct link *l_ptr, u32 msg_typ, int probe_msg, ...@@ -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); msg_set_max_pkt(msg, l_ptr->max_pkt_target);
} }
if (tipc_node_redundant_links(l_ptr->owner)) msg_set_redundant_link(msg, tipc_node_redundant_links(l_ptr->owner));
msg_set_redundant_link(msg);
else
msg_clear_redundant_link(msg);
msg_set_linkprio(msg, l_ptr->priority); msg_set_linkprio(msg, l_ptr->priority);
/* Ensure sequence number will not fit : */ /* Ensure sequence number will not fit : */
......
...@@ -719,14 +719,9 @@ static inline u32 msg_redundant_link(struct tipc_msg *m) ...@@ -719,14 +719,9 @@ static inline u32 msg_redundant_link(struct tipc_msg *m)
return msg_bits(m, 5, 12, 0x1); 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); msg_set_bits(m, 5, 12, 0x1, r);
}
static inline void msg_clear_redundant_link(struct tipc_msg *m)
{
msg_set_bits(m, 5, 12, 0x1, 0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment