diff options
| author |   Jon Paul Maloy <jon.maloy@ericsson.com> | 2015-05-14 10:46:11 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-05-14 12:24:45 -0400 |
| commit | b1c29f6b10d5981c89d3ea9b9991ca97141ed6d0 (patch) | |
| tree | e0ad8668ed30f2d253423beba2c614baab2ec781 /net/tipc/link.h | |
| parent | Merge branch 'be2net-next' (diff) | |
| download | linux-dev-b1c29f6b10d5981c89d3ea9b9991ca97141ed6d0.tar.xz linux-dev-b1c29f6b10d5981c89d3ea9b9991ca97141ed6d0.zip | |
tipc: simplify resetting and disabling of bearers
Since commit 4b475e3f2f8e4e241de101c8240f1d74d0470494
("tipc: eliminate delayed link deletion at link failover") the extra
boolean parameter "shutting_down" is not any longer needed for the
functions bearer_disable() and tipc_link_delete_list().
Furhermore, the function tipc_link_reset_links(), called from
bearer_reset() is now unnecessary. We can just as well delete
all the links, as we do in bearer_disable(), and start over with
creating new links.
This commit introduces those changes.
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/link.h')
| -rw-r--r-- | net/tipc/link.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/tipc/link.h b/net/tipc/link.h index b5b4e3554d4e..dc27bb62b1f5 100644 --- a/net/tipc/link.h +++ b/net/tipc/link.h @@ -213,8 +213,7 @@ struct tipc_link *tipc_link_create(struct tipc_node *n_ptr, struct tipc_bearer *b_ptr, const struct tipc_media_addr *media_addr); void tipc_link_delete(struct tipc_link *link); -void tipc_link_delete_list(struct net *net, unsigned int bearer_id, - bool shutting_down); +void tipc_link_delete_list(struct net *net, unsigned int bearer_id); void tipc_link_failover_send_queue(struct tipc_link *l_ptr); void tipc_link_dup_queue_xmit(struct tipc_link *l_ptr, struct tipc_link *dest); void tipc_link_reset_fragments(struct tipc_link *l_ptr); @@ -223,7 +222,6 @@ int tipc_link_is_active(struct tipc_link *l_ptr); void tipc_link_purge_queues(struct tipc_link *l_ptr); void tipc_link_reset_all(struct tipc_node *node); void tipc_link_reset(struct tipc_link *l_ptr); -void tipc_link_reset_list(struct net *net, unsigned int bearer_id); int tipc_link_xmit_skb(struct net *net, struct sk_buff *skb, u32 dest, u32 selector); int tipc_link_xmit(struct net *net, struct sk_buff_head *list, u32 dest, |