aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/node.c
diff options
context:
space:
mode:
authorJon Paul Maloy <jon.maloy@ericsson.com>2015-10-22 08:51:48 -0400
committerDavid S. Miller <davem@davemloft.net>2015-10-24 09:56:47 -0400
commit2af5ae372a4b6d6e2d3314af0e9c865d6d64f8d3 (patch)
tree5da9c2e91de35b9111a3badb947416deba5083d8 /net/tipc/node.c
parentc49a0a84391bcc313b3dc2a9ceee6de684e07655 (diff)
tipc: clean up unused code and structures
After the previous changes in this series, we can now remove some unused code and structures, both in the broadcast, link aggregation and link code. There are no functional changes in this commit. Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Reviewed-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r--net/tipc/node.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c
index f4772f53f41a..7493506b069b 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -606,7 +606,7 @@ void tipc_node_check_dest(struct net *net, u32 onode,
606 b->net_plane, b->mtu, b->priority, 606 b->net_plane, b->mtu, b->priority,
607 b->window, mod(tipc_net(net)->random), 607 b->window, mod(tipc_net(net)->random),
608 tipc_own_addr(net), onode, 608 tipc_own_addr(net), onode,
609 n->capabilities, &le->maddr, 609 n->capabilities,
610 tipc_bc_sndlink(n->net), n->bc_entry.link, 610 tipc_bc_sndlink(n->net), n->bc_entry.link,
611 &le->inputq, 611 &le->inputq,
612 &n->bc_entry.namedq, &l)) { 612 &n->bc_entry.namedq, &l)) {
@@ -943,18 +943,13 @@ void tipc_node_unlock(struct tipc_node *node)
943 publ_list = &node->publ_list; 943 publ_list = &node->publ_list;
944 944
945 node->action_flags &= ~(TIPC_NOTIFY_NODE_DOWN | TIPC_NOTIFY_NODE_UP | 945 node->action_flags &= ~(TIPC_NOTIFY_NODE_DOWN | TIPC_NOTIFY_NODE_UP |
946 TIPC_NOTIFY_LINK_DOWN | TIPC_NOTIFY_LINK_UP | 946 TIPC_NOTIFY_LINK_DOWN | TIPC_NOTIFY_LINK_UP);
947 TIPC_WAKEUP_BCAST_USERS | TIPC_BCAST_MSG_EVT |
948 TIPC_BCAST_RESET);
949 947
950 spin_unlock_bh(&node->lock); 948 spin_unlock_bh(&node->lock);
951 949
952 if (flags & TIPC_NOTIFY_NODE_DOWN) 950 if (flags & TIPC_NOTIFY_NODE_DOWN)
953 tipc_publ_notify(net, publ_list, addr); 951 tipc_publ_notify(net, publ_list, addr);
954 952
955 if (flags & TIPC_WAKEUP_BCAST_USERS)
956 tipc_bclink_wakeup_users(net);
957
958 if (flags & TIPC_NOTIFY_NODE_UP) 953 if (flags & TIPC_NOTIFY_NODE_UP)
959 tipc_named_node_up(net, addr); 954 tipc_named_node_up(net, addr);
960 955
@@ -966,11 +961,6 @@ void tipc_node_unlock(struct tipc_node *node)
966 tipc_nametbl_withdraw(net, TIPC_LINK_STATE, addr, 961 tipc_nametbl_withdraw(net, TIPC_LINK_STATE, addr,
967 link_id, addr); 962 link_id, addr);
968 963
969 if (flags & TIPC_BCAST_MSG_EVT)
970 tipc_bclink_input(net);
971
972 if (flags & TIPC_BCAST_RESET)
973 tipc_node_reset_links(node);
974} 964}
975 965
976/* Caller should hold node lock for the passed node */ 966/* Caller should hold node lock for the passed node */