Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1817877b authored by Richard Alpe's avatar Richard Alpe Committed by David S. Miller
Browse files

tipc: convert legacy nl link stat reset to nl compat 



Convert TIPC_CMD_RESET_LINK_STATS to compat doit.

Signed-off-by: default avatarRichard Alpe <richard.alpe@ericsson.com>
Reviewed-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Reviewed-by: default avatarYing Xue <ying.xue@windriver.com>
Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 37e2d484

net/tipc/config.c

+0 −4
Original line number Diff line number Diff line
@@ -209,10 +209,6 @@ struct sk_buff *tipc_cfg_do_cmd(struct net *net, u32 orig_node, u16 cmd, 
		rep_tlv_buf = tipc_node_get_nodes(net, req_tlv_area,

						  req_tlv_space);

		break;

	case TIPC_CMD_RESET_LINK_STATS:

		rep_tlv_buf = tipc_link_cmd_reset_stats(net, req_tlv_area,

							req_tlv_space);

		break;

	case TIPC_CMD_SHOW_NAME_TABLE:

		rep_tlv_buf = tipc_nametbl_get(net, req_tlv_area,

					       req_tlv_space);

net/tipc/link.c

+1 −34
Original line number Diff line number Diff line
@@ -1969,39 +1969,6 @@ static void link_reset_statistics(struct tipc_link *l_ptr) 
	l_ptr->stats.recv_info = l_ptr->next_in_no;

}



struct sk_buff *tipc_link_cmd_reset_stats(struct net *net,

					  const void *req_tlv_area,

					  int req_tlv_space)

{

	char *link_name;

	struct tipc_link *l_ptr;

	struct tipc_node *node;

	unsigned int bearer_id;



	if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_LINK_NAME))

		return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);



	link_name = (char *)TLV_DATA(req_tlv_area);

	if (!strcmp(link_name, tipc_bclink_name)) {

		if (tipc_bclink_reset_stats(net))

			return tipc_cfg_reply_error_string("link not found");

		return tipc_cfg_reply_none();

	}

	node = tipc_link_find_owner(net, link_name, &bearer_id);

	if (!node)

		return tipc_cfg_reply_error_string("link not found");



	tipc_node_lock(node);

	l_ptr = node->links[bearer_id];

	if (!l_ptr) {

		tipc_node_unlock(node);

		return tipc_cfg_reply_error_string("link not found");

	}

	link_reset_statistics(l_ptr);

	tipc_node_unlock(node);

	return tipc_cfg_reply_none();

}



static void link_print(struct tipc_link *l_ptr, const char *str)

{

	struct tipc_net *tn = net_generic(l_ptr->owner->net, tipc_net_id);
@@ -2424,7 +2391,7 @@ int tipc_nl_link_reset_stats(struct sk_buff *skb, struct genl_info *info) 
	struct tipc_link *link;

	struct tipc_node *node;

	struct nlattr *attrs[TIPC_NLA_LINK_MAX + 1];

	struct net *net = genl_info_net(info);

	struct net *net = sock_net(skb->sk);



	if (!info->attrs[TIPC_NLA_LINK])

		return -EINVAL;

net/tipc/link.h

+0 −3
Original line number Diff line number Diff line
@@ -215,9 +215,6 @@ void tipc_link_reset_fragments(struct tipc_link *l_ptr); 
int tipc_link_is_up(struct tipc_link *l_ptr);

int tipc_link_is_active(struct tipc_link *l_ptr);

void tipc_link_purge_queues(struct tipc_link *l_ptr);

struct sk_buff *tipc_link_cmd_reset_stats(struct net *net,

					  const void *req_tlv_area,

					  int req_tlv_space);

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);

net/tipc/netlink_compat.c

+26 −0
Original line number Diff line number Diff line
@@ -606,6 +606,26 @@ static int tipc_nl_compat_link_set(struct sk_buff *skb, 
	return 0;

}



static int tipc_nl_compat_link_reset_stats(struct sk_buff *skb,

					   struct tipc_nl_compat_msg *msg)

{

	char *name;

	struct nlattr *link;



	name = (char *)TLV_DATA(msg->req);



	link = nla_nest_start(skb, TIPC_NLA_LINK);

	if (!link)

		return -EMSGSIZE;



	if (nla_put_string(skb, TIPC_NLA_LINK_NAME, name))

		return -EMSGSIZE;



	nla_nest_end(skb, link);



	return 0;

}



static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg)

{

	struct tipc_nl_compat_cmd_dump dump;
@@ -650,6 +670,11 @@ static int tipc_nl_compat_handle(struct tipc_nl_compat_msg *msg) 
		doit.doit = tipc_nl_link_set;

		doit.transcode = tipc_nl_compat_link_set;

		return tipc_nl_compat_doit(&doit, msg);

	case TIPC_CMD_RESET_LINK_STATS:

		msg->req_type = TIPC_TLV_LINK_NAME;

		doit.doit = tipc_nl_link_reset_stats;

		doit.transcode = tipc_nl_compat_link_reset_stats;

		return tipc_nl_compat_doit(&doit, msg);

	}



	return -EOPNOTSUPP;
@@ -754,6 +779,7 @@ static int tipc_nl_compat_tmp_wrap(struct sk_buff *skb, struct genl_info *info) 
	case TIPC_CMD_SET_LINK_TOL:

	case TIPC_CMD_SET_LINK_PRI:

	case TIPC_CMD_SET_LINK_WINDOW:

	case TIPC_CMD_RESET_LINK_STATS:

		return tipc_nl_compat_recv(skb, info);

	}