diff options
author | Ying Xue <ying.xue@windriver.com> | 2012-11-16 00:51:30 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-11-22 07:50:51 -0500 |
commit | 389dd9bcf65e10929cedfeb79c49bd02069b8899 (patch) | |
tree | 13941aa4eb7ce60d2cf07aab234dcfd2d29f7a07 /net/tipc/link.c | |
parent | 818f4da526656a100c637b098be06316fd4624e4 (diff) |
tipc: rename supported flag to recv_permitted
Rename the "supported" flag in bclink structure to "recv_permitted"
to better reflect what it is used for. When this flag is set for a
given node, we are permitted to receive and acknowledge broadcast
messages from that node. Convert it to a bool at the same time,
since it is not used to store any numerical values.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/link.c')
-rw-r--r-- | net/tipc/link.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index f3a078fe70c8..20f128fc2be1 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -1426,8 +1426,8 @@ static void link_retransmit_failure(struct tipc_link *l_ptr, | |||
1426 | 1426 | ||
1427 | tipc_addr_string_fill(addr_string, n_ptr->addr); | 1427 | tipc_addr_string_fill(addr_string, n_ptr->addr); |
1428 | pr_info("Broadcast link info for %s\n", addr_string); | 1428 | pr_info("Broadcast link info for %s\n", addr_string); |
1429 | pr_info("Supported: %d, Acked: %u\n", | 1429 | pr_info("Reception permitted: %d, Acked: %u\n", |
1430 | n_ptr->bclink.supported, | 1430 | n_ptr->bclink.recv_permitted, |
1431 | n_ptr->bclink.acked); | 1431 | n_ptr->bclink.acked); |
1432 | pr_info("Last in: %u, Oos state: %u, Last sent: %u\n", | 1432 | pr_info("Last in: %u, Oos state: %u, Last sent: %u\n", |
1433 | n_ptr->bclink.last_in, | 1433 | n_ptr->bclink.last_in, |
@@ -1640,7 +1640,7 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *b_ptr) | |||
1640 | ackd = msg_ack(msg); | 1640 | ackd = msg_ack(msg); |
1641 | 1641 | ||
1642 | /* Release acked messages */ | 1642 | /* Release acked messages */ |
1643 | if (n_ptr->bclink.supported) | 1643 | if (n_ptr->bclink.recv_permitted) |
1644 | tipc_bclink_acknowledge(n_ptr, msg_bcast_ack(msg)); | 1644 | tipc_bclink_acknowledge(n_ptr, msg_bcast_ack(msg)); |
1645 | 1645 | ||
1646 | crs = l_ptr->first_out; | 1646 | crs = l_ptr->first_out; |
@@ -2067,7 +2067,7 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf) | |||
2067 | } | 2067 | } |
2068 | 2068 | ||
2069 | /* Protocol message before retransmits, reduce loss risk */ | 2069 | /* Protocol message before retransmits, reduce loss risk */ |
2070 | if (l_ptr->owner->bclink.supported) | 2070 | if (l_ptr->owner->bclink.recv_permitted) |
2071 | tipc_bclink_update_link_state(l_ptr->owner, | 2071 | tipc_bclink_update_link_state(l_ptr->owner, |
2072 | msg_last_bcast(msg)); | 2072 | msg_last_bcast(msg)); |
2073 | 2073 | ||