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

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

tipc: add bearer set to new netlink api 



Add TIPC_NL_BEARER_SET command to the new tipc netlink API.

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

Netlink logical layout of bearer set message:
-> bearer
    -> name
    -> link 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 35b9dd76

include/uapi/linux/tipc_netlink.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ enum { 
	TIPC_NL_BEARER_DISABLE,

	TIPC_NL_BEARER_ENABLE,

	TIPC_NL_BEARER_GET,

	TIPC_NL_BEARER_SET,



	__TIPC_NL_CMD_MAX,

	TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1

net/tipc/bearer.c

+49 −0
Original line number Diff line number Diff line
@@ -849,3 +849,52 @@ int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info) 


	return 0;

}



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

{

	int err;

	char *name;

	struct tipc_bearer *b;

	struct nlattr *attrs[TIPC_NLA_BEARER_MAX + 1];



	if (!info->attrs[TIPC_NLA_BEARER])

		return -EINVAL;



	err = nla_parse_nested(attrs, TIPC_NLA_BEARER_MAX,

			       info->attrs[TIPC_NLA_BEARER],

			       tipc_nl_bearer_policy);

	if (err)

		return err;



	if (!attrs[TIPC_NLA_BEARER_NAME])

		return -EINVAL;

	name = nla_data(attrs[TIPC_NLA_BEARER_NAME]);



	rtnl_lock();

	b = tipc_bearer_find(name);

	if (!b) {

		rtnl_unlock();

		return -EINVAL;

	}



	if (attrs[TIPC_NLA_BEARER_PROP]) {

		struct nlattr *props[TIPC_NLA_PROP_MAX + 1];



		err = tipc_nl_parse_link_prop(attrs[TIPC_NLA_BEARER_PROP],

					      props);

		if (err) {

			rtnl_unlock();

			return err;

		}



		if (props[TIPC_NLA_PROP_TOL])

			b->tolerance = nla_get_u32(props[TIPC_NLA_PROP_TOL]);

		if (props[TIPC_NLA_PROP_PRIO])

			b->priority = nla_get_u32(props[TIPC_NLA_PROP_PRIO]);

		if (props[TIPC_NLA_PROP_WIN])

			b->window = nla_get_u32(props[TIPC_NLA_PROP_WIN]);

	}

	rtnl_unlock();



	return 0;

}

net/tipc/bearer.h

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info); 
int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info);

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

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

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



int tipc_media_set_priority(const char *name, u32 new_value);

int tipc_media_set_window(const char *name, u32 new_value);

net/tipc/netlink.c

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

		.dumpit	= tipc_nl_bearer_dump,

		.policy = tipc_nl_policy,

	},

	{

		.cmd	= TIPC_NL_BEARER_SET,

		.doit	= tipc_nl_bearer_set,

		.policy = tipc_nl_policy,

	}

};