aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Stephens <Allan.Stephens@windriver.com>2011-02-28 15:30:20 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-03-13 16:35:17 -0400
commit77f167fcce4d2ea144d92891d1e0fc0c50554082 (patch)
treef662c67ee14b67a4cea6abcae45be33c3de6b920
parent8f19afb2dbc885befef2a4e7931dfcb51702a212 (diff)
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>
-rw-r--r--net/tipc/link.c5
-rw-r--r--net/tipc/msg.h9
2 files changed, 3 insertions, 11 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index d8a4b90b029c..6ffae0e8809e 100644
--- 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,
1954 msg_set_max_pkt(msg, l_ptr->max_pkt_target); 1954 msg_set_max_pkt(msg, l_ptr->max_pkt_target);
1955 } 1955 }
1956 1956
1957 if (tipc_node_redundant_links(l_ptr->owner)) 1957 msg_set_redundant_link(msg, tipc_node_redundant_links(l_ptr->owner));
1958 msg_set_redundant_link(msg);
1959 else
1960 msg_clear_redundant_link(msg);
1961 msg_set_linkprio(msg, l_ptr->priority); 1958 msg_set_linkprio(msg, l_ptr->priority);
1962 1959
1963 /* Ensure sequence number will not fit : */ 1960 /* Ensure sequence number will not fit : */
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 6948d3dbab0b..bea0126cb676 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -719,14 +719,9 @@ static inline u32 msg_redundant_link(struct tipc_msg *m)
719 return msg_bits(m, 5, 12, 0x1); 719 return msg_bits(m, 5, 12, 0x1);
720} 720}
721 721
722static inline void msg_set_redundant_link(struct tipc_msg *m) 722static inline void msg_set_redundant_link(struct tipc_msg *m, u32 r)
723{ 723{
724 msg_set_bits(m, 5, 12, 0x1, 1); 724 msg_set_bits(m, 5, 12, 0x1, r);
725}
726
727static inline void msg_clear_redundant_link(struct tipc_msg *m)
728{
729 msg_set_bits(m, 5, 12, 0x1, 0);
730} 725}
731 726
732 727