diff options
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/link.c | 8 | ||||
| -rw-r--r-- | net/tipc/net.c | 2 | ||||
| -rw-r--r-- | net/tipc/node.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 49f2be8622a9..c76e82e5f982 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
| @@ -877,7 +877,7 @@ static void link_state_event(struct link *l_ptr, unsigned event) | |||
| 877 | case TIMEOUT_EVT: | 877 | case TIMEOUT_EVT: |
| 878 | dbg_link("TIM "); | 878 | dbg_link("TIM "); |
| 879 | if (l_ptr->next_in_no != l_ptr->checkpoint) { | 879 | if (l_ptr->next_in_no != l_ptr->checkpoint) { |
| 880 | dbg_link("-> WW \n"); | 880 | dbg_link("-> WW\n"); |
| 881 | l_ptr->state = WORKING_WORKING; | 881 | l_ptr->state = WORKING_WORKING; |
| 882 | l_ptr->fsm_msg_cnt = 0; | 882 | l_ptr->fsm_msg_cnt = 0; |
| 883 | l_ptr->checkpoint = l_ptr->next_in_no; | 883 | l_ptr->checkpoint = l_ptr->next_in_no; |
| @@ -934,7 +934,7 @@ static void link_state_event(struct link *l_ptr, unsigned event) | |||
| 934 | link_set_timer(l_ptr, cont_intv); | 934 | link_set_timer(l_ptr, cont_intv); |
| 935 | break; | 935 | break; |
| 936 | case RESET_MSG: | 936 | case RESET_MSG: |
| 937 | dbg_link("RES \n"); | 937 | dbg_link("RES\n"); |
| 938 | dbg_link(" -> RR\n"); | 938 | dbg_link(" -> RR\n"); |
| 939 | l_ptr->state = RESET_RESET; | 939 | l_ptr->state = RESET_RESET; |
| 940 | l_ptr->fsm_msg_cnt = 0; | 940 | l_ptr->fsm_msg_cnt = 0; |
| @@ -947,7 +947,7 @@ static void link_state_event(struct link *l_ptr, unsigned event) | |||
| 947 | l_ptr->started = 1; | 947 | l_ptr->started = 1; |
| 948 | /* fall through */ | 948 | /* fall through */ |
| 949 | case TIMEOUT_EVT: | 949 | case TIMEOUT_EVT: |
| 950 | dbg_link("TIM \n"); | 950 | dbg_link("TIM\n"); |
| 951 | tipc_link_send_proto_msg(l_ptr, RESET_MSG, 0, 0, 0, 0, 0); | 951 | tipc_link_send_proto_msg(l_ptr, RESET_MSG, 0, 0, 0, 0, 0); |
| 952 | l_ptr->fsm_msg_cnt++; | 952 | l_ptr->fsm_msg_cnt++; |
| 953 | link_set_timer(l_ptr, cont_intv); | 953 | link_set_timer(l_ptr, cont_intv); |
| @@ -3295,7 +3295,7 @@ static void link_dump_rec_queue(struct link *l_ptr) | |||
| 3295 | info("buffer %x invalid\n", crs); | 3295 | info("buffer %x invalid\n", crs); |
| 3296 | return; | 3296 | return; |
| 3297 | } | 3297 | } |
| 3298 | msg_dbg(buf_msg(crs), "In rec queue: \n"); | 3298 | msg_dbg(buf_msg(crs), "In rec queue:\n"); |
| 3299 | crs = crs->next; | 3299 | crs = crs->next; |
| 3300 | } | 3300 | } |
| 3301 | } | 3301 | } |
diff --git a/net/tipc/net.c b/net/tipc/net.c index f25b1cdb64eb..79ce8fa2b77a 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
| @@ -291,6 +291,6 @@ void tipc_net_stop(void) | |||
| 291 | tipc_bclink_stop(); | 291 | tipc_bclink_stop(); |
| 292 | net_stop(); | 292 | net_stop(); |
| 293 | write_unlock_bh(&tipc_net_lock); | 293 | write_unlock_bh(&tipc_net_lock); |
| 294 | info("Left network mode \n"); | 294 | info("Left network mode\n"); |
| 295 | } | 295 | } |
| 296 | 296 | ||
diff --git a/net/tipc/node.c b/net/tipc/node.c index 2c24e7d6d950..17cc394f424f 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
| @@ -278,7 +278,7 @@ struct tipc_node *tipc_node_attach_link(struct link *l_ptr) | |||
| 278 | n_ptr->link_cnt++; | 278 | n_ptr->link_cnt++; |
| 279 | return n_ptr; | 279 | return n_ptr; |
| 280 | } | 280 | } |
| 281 | err("Attempt to establish second link on <%s> to %s \n", | 281 | err("Attempt to establish second link on <%s> to %s\n", |
| 282 | l_ptr->b_ptr->publ.name, | 282 | l_ptr->b_ptr->publ.name, |
| 283 | addr_string_fill(addr_string, l_ptr->addr)); | 283 | addr_string_fill(addr_string, l_ptr->addr)); |
| 284 | } | 284 | } |
