diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-28 10:36:21 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-13 16:35:17 -0400 |
commit | 8f19afb2dbc885befef2a4e7931dfcb51702a212 (patch) | |
tree | 95282135e7acd78d4e73a19c69466f8675507c57 /net | |
parent | e7b3acb6a85266dfd3e102b3d15b51b0ecd6bc2e (diff) |
tipc: cosmetic - function names are not to be full sentences
Function names like "tipc_node_has_redundant_links" are unweildy
and result in long lines even for simple lines. The "has" doesn't
contribute any value add, so dropping that is a slight step in the
right direction. This is a cosmetic change, basic result of:
for i in `grep -l tipc_node_has_ *` ; do sed -i s/tipc_node_has_/tipc_node_/ $i ; done
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/tipc/link.c | 6 | ||||
-rw-r--r-- | net/tipc/name_distr.c | 2 | ||||
-rw-r--r-- | net/tipc/node.c | 6 | ||||
-rw-r--r-- | net/tipc/node.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index d4f2780ff871..d8a4b90b029c 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -548,7 +548,7 @@ void tipc_link_reset(struct link *l_ptr) | |||
548 | tipc_node_link_down(l_ptr->owner, l_ptr); | 548 | tipc_node_link_down(l_ptr->owner, l_ptr); |
549 | tipc_bearer_remove_dest(l_ptr->b_ptr, l_ptr->addr); | 549 | tipc_bearer_remove_dest(l_ptr->b_ptr, l_ptr->addr); |
550 | 550 | ||
551 | if (was_active_link && tipc_node_has_active_links(l_ptr->owner) && | 551 | if (was_active_link && tipc_node_active_links(l_ptr->owner) && |
552 | l_ptr->owner->permit_changeover) { | 552 | l_ptr->owner->permit_changeover) { |
553 | l_ptr->reset_checkpoint = checkpoint; | 553 | l_ptr->reset_checkpoint = checkpoint; |
554 | l_ptr->exp_msg_count = START_CHANGEOVER; | 554 | l_ptr->exp_msg_count = START_CHANGEOVER; |
@@ -1954,7 +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_has_redundant_links(l_ptr->owner)) | 1957 | if (tipc_node_redundant_links(l_ptr->owner)) |
1958 | msg_set_redundant_link(msg); | 1958 | msg_set_redundant_link(msg); |
1959 | else | 1959 | else |
1960 | msg_clear_redundant_link(msg); | 1960 | msg_clear_redundant_link(msg); |
@@ -2064,7 +2064,7 @@ static void link_recv_proto_msg(struct link *l_ptr, struct sk_buff *buf) | |||
2064 | l_ptr->peer_bearer_id = msg_bearer_id(msg); | 2064 | l_ptr->peer_bearer_id = msg_bearer_id(msg); |
2065 | 2065 | ||
2066 | /* Synchronize broadcast sequence numbers */ | 2066 | /* Synchronize broadcast sequence numbers */ |
2067 | if (!tipc_node_has_redundant_links(l_ptr->owner)) | 2067 | if (!tipc_node_redundant_links(l_ptr->owner)) |
2068 | l_ptr->owner->bclink.last_in = mod(msg_last_bcast(msg)); | 2068 | l_ptr->owner->bclink.last_in = mod(msg_last_bcast(msg)); |
2069 | break; | 2069 | break; |
2070 | case STATE_MSG: | 2070 | case STATE_MSG: |
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 1b70d5d051d0..c9fa6dfcf287 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c | |||
@@ -111,7 +111,7 @@ static void named_cluster_distribute(struct sk_buff *buf) | |||
111 | struct tipc_node *n_ptr; | 111 | struct tipc_node *n_ptr; |
112 | 112 | ||
113 | list_for_each_entry(n_ptr, &tipc_node_list, list) { | 113 | list_for_each_entry(n_ptr, &tipc_node_list, list) { |
114 | if (tipc_node_has_active_links(n_ptr)) { | 114 | if (tipc_node_active_links(n_ptr)) { |
115 | buf_copy = skb_copy(buf, GFP_ATOMIC); | 115 | buf_copy = skb_copy(buf, GFP_ATOMIC); |
116 | if (!buf_copy) | 116 | if (!buf_copy) |
117 | break; | 117 | break; |
diff --git a/net/tipc/node.c b/net/tipc/node.c index 66099cb1d6d6..ca09b33fb87f 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -223,19 +223,19 @@ void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr) | |||
223 | node_lost_contact(n_ptr); | 223 | node_lost_contact(n_ptr); |
224 | } | 224 | } |
225 | 225 | ||
226 | int tipc_node_has_active_links(struct tipc_node *n_ptr) | 226 | int tipc_node_active_links(struct tipc_node *n_ptr) |
227 | { | 227 | { |
228 | return n_ptr->active_links[0] != NULL; | 228 | return n_ptr->active_links[0] != NULL; |
229 | } | 229 | } |
230 | 230 | ||
231 | int tipc_node_has_redundant_links(struct tipc_node *n_ptr) | 231 | int tipc_node_redundant_links(struct tipc_node *n_ptr) |
232 | { | 232 | { |
233 | return n_ptr->working_links > 1; | 233 | return n_ptr->working_links > 1; |
234 | } | 234 | } |
235 | 235 | ||
236 | int tipc_node_is_up(struct tipc_node *n_ptr) | 236 | int tipc_node_is_up(struct tipc_node *n_ptr) |
237 | { | 237 | { |
238 | return tipc_node_has_active_links(n_ptr); | 238 | return tipc_node_active_links(n_ptr); |
239 | } | 239 | } |
240 | 240 | ||
241 | struct tipc_node *tipc_node_attach_link(struct link *l_ptr) | 241 | struct tipc_node *tipc_node_attach_link(struct link *l_ptr) |
diff --git a/net/tipc/node.h b/net/tipc/node.h index 02e4927216fa..dde316576f81 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h | |||
@@ -115,8 +115,8 @@ struct tipc_node *tipc_node_attach_link(struct link *l_ptr); | |||
115 | void tipc_node_detach_link(struct tipc_node *n_ptr, struct link *l_ptr); | 115 | void tipc_node_detach_link(struct tipc_node *n_ptr, struct link *l_ptr); |
116 | void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr); | 116 | void tipc_node_link_down(struct tipc_node *n_ptr, struct link *l_ptr); |
117 | void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr); | 117 | void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr); |
118 | int tipc_node_has_active_links(struct tipc_node *n_ptr); | 118 | int tipc_node_active_links(struct tipc_node *n_ptr); |
119 | int tipc_node_has_redundant_links(struct tipc_node *n_ptr); | 119 | int tipc_node_redundant_links(struct tipc_node *n_ptr); |
120 | int tipc_node_is_up(struct tipc_node *n_ptr); | 120 | int tipc_node_is_up(struct tipc_node *n_ptr); |
121 | struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space); | 121 | struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space); |
122 | struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space); | 122 | struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space); |