From: <richard.alpe@ericsson.com>
To: <netdev@vger.kernel.org>
Cc: tipc-discussion@lists.sourceforge.net
Subject: [PATCH v2 net-next 07/15] tipc: add link set to new netlink api
Date: Thu, 2 Oct 2014 16:58:33 +0200 [thread overview]
Message-ID: <1412261921-28510-8-git-send-email-richard.alpe@ericsson.com> (raw)
In-Reply-To: <1412261921-28510-1-git-send-email-richard.alpe@ericsson.com>
From: Richard Alpe <richard.alpe@ericsson.com>
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: Richard Alpe <richard.alpe@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Acked-by: Ying Xue <ying.xue@windriver.com>
---
include/uapi/linux/tipc_config.h | 1 +
net/tipc/link.c | 73 ++++++++++++++++++++++++++++++++++++++
net/tipc/link.h | 1 +
net/tipc/netlink.c | 5 +++
4 files changed, 80 insertions(+)
diff --git a/include/uapi/linux/tipc_config.h b/include/uapi/linux/tipc_config.h
index 459236a..ab1622e 100644
--- a/include/uapi/linux/tipc_config.h
+++ b/include/uapi/linux/tipc_config.h
@@ -57,6 +57,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
diff --git a/net/tipc/link.c b/net/tipc/link.c
index e0aaca4..6d0c1fa 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2435,6 +2435,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;
diff --git a/net/tipc/link.h b/net/tipc/link.h
index 8e3542a..3738ba1 100644
--- a/net/tipc/link.h
+++ b/net/tipc/link.h
@@ -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[]);
/*
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 4976212..1ed8288 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -129,6 +129,11 @@ static const struct genl_ops tipc_genl_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,
}
};
--
1.7.10.4
------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
next prev parent reply other threads:[~2014-10-02 14:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-02 14:58 [PATCH v2 net-next 00/15] tipc: new netlink API richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 01/15] tipc: add bearer disable/enable to new netlink api richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 02/15] tipc: add bearer get/dump " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 03/15] tipc: add bearer set " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 04/15] tipc: add sock dump " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 05/15] tipc: add publication " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 06/15] tipc: add link get/dump " richard.alpe
2014-10-02 14:58 ` richard.alpe [this message]
2014-10-02 14:58 ` [PATCH v2 net-next 08/15] tipc: add link stat reset " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 09/15] tipc: add media get/dump " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 10/15] tipc: add media set " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 11/15] tipc: add node get/dump " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 12/15] tipc: add net dump " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 13/15] tipc: add net set " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 14/15] tipc: add name table dump " richard.alpe
2014-10-02 14:58 ` [PATCH v2 net-next 15/15] tipc: remove old ASCII netlink API richard.alpe
2014-10-03 23:50 ` David Miller
2014-10-06 13:37 ` Jon Maloy
2014-10-06 19:20 ` David Miller
2014-10-06 21:47 ` Jon Paul Maloy
2014-10-08 12:02 ` Richard Alpe
2014-10-08 17:19 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1412261921-28510-8-git-send-email-richard.alpe@ericsson.com \
--to=richard.alpe@ericsson.com \
--cc=netdev@vger.kernel.org \
--cc=tipc-discussion@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).