mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 15:27:29 +00:00
tipc: convert legacy nl link dump to nl compat
Convert TIPC_CMD_GET_LINKS to compat dumpit and remove global link counter solely used by the legacy API. Signed-off-by: Richard Alpe <richard.alpe@ericsson.com> Reviewed-by: Erik Hugne <erik.hugne@ericsson.com> Reviewed-by: Ying Xue <ying.xue@windriver.com> Reviewed-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f2b3b2d4cc
commit
357ebdbfca
4 changed files with 23 additions and 79 deletions
|
@ -319,27 +319,18 @@ int tipc_node_is_up(struct tipc_node *n_ptr)
|
|||
|
||||
void tipc_node_attach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
|
||||
{
|
||||
struct tipc_net *tn = net_generic(n_ptr->net, tipc_net_id);
|
||||
|
||||
n_ptr->links[l_ptr->bearer_id] = l_ptr;
|
||||
spin_lock_bh(&tn->node_list_lock);
|
||||
tn->num_links++;
|
||||
spin_unlock_bh(&tn->node_list_lock);
|
||||
n_ptr->link_cnt++;
|
||||
}
|
||||
|
||||
void tipc_node_detach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
|
||||
{
|
||||
struct tipc_net *tn = net_generic(n_ptr->net, tipc_net_id);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < MAX_BEARERS; i++) {
|
||||
if (l_ptr != n_ptr->links[i])
|
||||
continue;
|
||||
n_ptr->links[i] = NULL;
|
||||
spin_lock_bh(&tn->node_list_lock);
|
||||
tn->num_links--;
|
||||
spin_unlock_bh(&tn->node_list_lock);
|
||||
n_ptr->link_cnt--;
|
||||
}
|
||||
}
|
||||
|
@ -467,70 +458,6 @@ struct sk_buff *tipc_node_get_nodes(struct net *net, const void *req_tlv_area,
|
|||
return buf;
|
||||
}
|
||||
|
||||
struct sk_buff *tipc_node_get_links(struct net *net, const void *req_tlv_area,
|
||||
int req_tlv_space)
|
||||
{
|
||||
struct tipc_net *tn = net_generic(net, tipc_net_id);
|
||||
u32 domain;
|
||||
struct sk_buff *buf;
|
||||
struct tipc_node *n_ptr;
|
||||
struct tipc_link_info link_info;
|
||||
u32 payload_size;
|
||||
|
||||
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR))
|
||||
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
|
||||
|
||||
domain = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
|
||||
if (!tipc_addr_domain_valid(domain))
|
||||
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
|
||||
" (network address)");
|
||||
|
||||
if (!tn->own_addr)
|
||||
return tipc_cfg_reply_none();
|
||||
|
||||
spin_lock_bh(&tn->node_list_lock);
|
||||
/* Get space for all unicast links + broadcast link */
|
||||
payload_size = TLV_SPACE((sizeof(link_info)) * (tn->num_links + 1));
|
||||
if (payload_size > 32768u) {
|
||||
spin_unlock_bh(&tn->node_list_lock);
|
||||
return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
|
||||
" (too many links)");
|
||||
}
|
||||
spin_unlock_bh(&tn->node_list_lock);
|
||||
|
||||
buf = tipc_cfg_reply_alloc(payload_size);
|
||||
if (!buf)
|
||||
return NULL;
|
||||
|
||||
/* Add TLV for broadcast link */
|
||||
link_info.dest = htonl(tipc_cluster_mask(tn->own_addr));
|
||||
link_info.up = htonl(1);
|
||||
strlcpy(link_info.str, tipc_bclink_name, TIPC_MAX_LINK_NAME);
|
||||
tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info));
|
||||
|
||||
/* Add TLVs for any other links in scope */
|
||||
rcu_read_lock();
|
||||
list_for_each_entry_rcu(n_ptr, &tn->node_list, list) {
|
||||
u32 i;
|
||||
|
||||
if (!tipc_in_scope(domain, n_ptr->addr))
|
||||
continue;
|
||||
tipc_node_lock(n_ptr);
|
||||
for (i = 0; i < MAX_BEARERS; i++) {
|
||||
if (!n_ptr->links[i])
|
||||
continue;
|
||||
link_info.dest = htonl(n_ptr->addr);
|
||||
link_info.up = htonl(tipc_link_is_up(n_ptr->links[i]));
|
||||
strcpy(link_info.str, n_ptr->links[i]->name);
|
||||
tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO,
|
||||
&link_info, sizeof(link_info));
|
||||
}
|
||||
tipc_node_unlock(n_ptr);
|
||||
}
|
||||
rcu_read_unlock();
|
||||
return buf;
|
||||
}
|
||||
|
||||
/**
|
||||
* tipc_node_get_linkname - get the name of a link
|
||||
*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue