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

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

tipc: add link set to new netlink api 



Add TIPC_NL_LINK_SET to the new tipc netlink API.

This command can set one or more link properties for a particular
link.

Netlink logical layout of link set message:
-> link
    -> name
    -> properties
        [ -> tolerance ]
        [ -> priority ]
        [ -> window ]

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

include/uapi/linux/tipc_netlink.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ enum { 
	TIPC_NL_SOCK_GET,

	TIPC_NL_PUBL_GET,

	TIPC_NL_LINK_GET,

	TIPC_NL_LINK_SET,



	__TIPC_NL_CMD_MAX,

	TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1

net/tipc/link.c

+73 −0
Original line number Diff line number Diff line
@@ -2441,6 +2441,79 @@ int tipc_nl_parse_link_prop(struct nlattr *prop, struct nlattr *props[]) 
	return 0;

}



int tipc_nl_link_set(struct sk_buff *skb, struct genl_info *info)

{

	int err;

	int res = 0;

	int bearer_id;

	char *name;

	struct tipc_link *link;

	struct tipc_node *node;

	struct nlattr *attrs[TIPC_NLA_LINK_MAX + 1];



	if (!info->attrs[TIPC_NLA_LINK])

		return -EINVAL;



	err = nla_parse_nested(attrs, TIPC_NLA_LINK_MAX,

			       info->attrs[TIPC_NLA_LINK],

			       tipc_nl_link_policy);

	if (err)

		return err;



	if (!attrs[TIPC_NLA_LINK_NAME])

		return -EINVAL;



	name = nla_data(attrs[TIPC_NLA_LINK_NAME]);



	node = tipc_link_find_owner(name, &bearer_id);

	if (!node)

		return -EINVAL;



	tipc_node_lock(node);



	link = node->links[bearer_id];

	if (!link) {

		res = -EINVAL;

		goto out;

	}



	if (attrs[TIPC_NLA_LINK_PROP]) {

		struct nlattr *props[TIPC_NLA_PROP_MAX + 1];



		err = tipc_nl_parse_link_prop(attrs[TIPC_NLA_LINK_PROP],

					      props);

		if (err) {

			res = err;

			goto out;

		}



		if (props[TIPC_NLA_PROP_TOL]) {

			u32 tol;



			tol = nla_get_u32(props[TIPC_NLA_PROP_TOL]);

			link_set_supervision_props(link, tol);

			tipc_link_proto_xmit(link, STATE_MSG, 0, 0, tol, 0, 0);

		}

		if (props[TIPC_NLA_PROP_PRIO]) {

			u32 prio;



			prio = nla_get_u32(props[TIPC_NLA_PROP_PRIO]);

			link->priority = prio;

			tipc_link_proto_xmit(link, STATE_MSG, 0, 0, 0, prio, 0);

		}

		if (props[TIPC_NLA_PROP_WIN]) {

			u32 win;



			win = nla_get_u32(props[TIPC_NLA_PROP_WIN]);

			tipc_link_set_queue_limits(link, win);

		}

	}



out:

	tipc_node_unlock(node);



	return res;

}

int __tipc_nl_add_stats(struct sk_buff *skb, struct tipc_stats *s)

{

	int i;

net/tipc/link.h

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ void tipc_link_retransmit(struct tipc_link *l_ptr, 


int tipc_nl_link_dump(struct sk_buff *skb, struct netlink_callback *cb);

int tipc_nl_link_get(struct sk_buff *skb, struct genl_info *info);

int tipc_nl_link_set(struct sk_buff *skb, struct genl_info *info);

int tipc_nl_parse_link_prop(struct nlattr *prop, struct nlattr *props[]);



/*

net/tipc/netlink.c

+5 −0
Original line number Diff line number Diff line
@@ -144,6 +144,11 @@ static const struct genl_ops tipc_genl_v2_ops[] = { 
		.doit   = tipc_nl_link_get,

		.dumpit	= tipc_nl_link_dump,

		.policy = tipc_nl_policy,

	},

	{

		.cmd	= TIPC_NL_LINK_SET,

		.doit	= tipc_nl_link_set,

		.policy = tipc_nl_policy,

	}

};