diff options
| author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2015-10-22 14:51:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-24 15:56:47 +0200 |
| commit | 2af5ae372a4b6d6e2d3314af0e9c865d6d64f8d3 (patch) | |
| tree | 5da9c2e91de35b9111a3badb947416deba5083d8 /net/tipc/node.c | |
| parent | tipc: ensure binding table initial distribution is sent via first link (diff) | |
| download | linux-2af5ae372a4b6d6e2d3314af0e9c865d6d64f8d3.tar.xz linux-2af5ae372a4b6d6e2d3314af0e9c865d6d64f8d3.zip | |
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.c | 14 |
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, b->net_plane, b->mtu, b->priority, b->window, mod(tipc_net(net)->random), tipc_own_addr(net), onode, - n->capabilities, &le->maddr, + n->capabilities, tipc_bc_sndlink(n->net), n->bc_entry.link, &le->inputq, &n->bc_entry.namedq, &l)) { @@ -943,18 +943,13 @@ void tipc_node_unlock(struct tipc_node *node) publ_list = &node->publ_list; node->action_flags &= ~(TIPC_NOTIFY_NODE_DOWN | TIPC_NOTIFY_NODE_UP | - TIPC_NOTIFY_LINK_DOWN | TIPC_NOTIFY_LINK_UP | - TIPC_WAKEUP_BCAST_USERS | TIPC_BCAST_MSG_EVT | - TIPC_BCAST_RESET); + TIPC_NOTIFY_LINK_DOWN | TIPC_NOTIFY_LINK_UP); spin_unlock_bh(&node->lock); if (flags & TIPC_NOTIFY_NODE_DOWN) tipc_publ_notify(net, publ_list, addr); - if (flags & TIPC_WAKEUP_BCAST_USERS) - tipc_bclink_wakeup_users(net); - if (flags & TIPC_NOTIFY_NODE_UP) tipc_named_node_up(net, addr); @@ -966,11 +961,6 @@ void tipc_node_unlock(struct tipc_node *node) tipc_nametbl_withdraw(net, TIPC_LINK_STATE, addr, link_id, addr); - if (flags & TIPC_BCAST_MSG_EVT) - tipc_bclink_input(net); - - if (flags & TIPC_BCAST_RESET) - tipc_node_reset_links(node); } /* Caller should hold node lock for the passed node */ |