From: Ahmed Amamou <ahmed@gandi.net>
To: netdev@vger.kernel.org
Cc: William Dauchy <william@gandi.net>, Ahmed Amamou <ahmed@gandi.net>
Subject: [PATCH RFC v2 12/21] net: rbridge: update node table
Date: Tue, 1 Sep 2015 17:43:07 +0200 [thread overview]
Message-ID: <1441122196-11662-13-git-send-email-ahmed@gandi.net> (raw)
In-Reply-To: <1441122196-11662-1-git-send-email-ahmed@gandi.net>
Signed-off-by: Ahmed Amamou <ahmed@gandi.net>
---
net/bridge/rbr_rtnetlink.c | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/net/bridge/rbr_rtnetlink.c b/net/bridge/rbr_rtnetlink.c
index 5b6dab4..23fd0d7 100644
--- a/net/bridge/rbr_rtnetlink.c
+++ b/net/bridge/rbr_rtnetlink.c
@@ -42,7 +42,50 @@ int rbr_set_data(struct net_device *dev, struct nlattr *tb[],
nick = nla_get_u16(data[IFLA_TRILL_ROOT]);
err = set_treeroot(br->rbr, htons(nick));
}
+ if (data[IFLA_TRILL_INFO]) {
+ struct rbr_nickinfo *rbr_ni;
+ struct rbr_node *old;
+ size_t old_size = 0;
+ size_t size = 0;
+ struct rbr *rbr;
+ if (!br->rbr)
+ return -EINVAL;
+
+ rbr = br->rbr;
+ size = nla_len(data[IFLA_TRILL_INFO]);
+ rbr_ni = kzalloc(size, GFP_KERNEL);
+ if (!rbr_ni)
+ goto fail;
+ memcpy(rbr_ni, nla_data(data[IFLA_TRILL_INFO]), size);
+ nick = rbr_ni->nick;
+ old = br->rbr->rbr_nodes[nick];
+ if (old)
+ old_size = RBR_NI_TOTALSIZE(old->rbr_ni);
+ /* replace old node by a new one only if nickname
+ * information have changed
+ */
+ if (!old || old_size != size ||
+ memcmp(old->rbr_ni, rbr_ni, size)) {
+ struct rbr_node *new;
+
+ new = kzalloc(sizeof(*old), GFP_KERNEL);
+ if (!new) {
+ kfree(rbr_ni);
+ goto fail;
+ }
+ atomic_set(&new->refs, 1);
+ new->rbr_ni = rbr_ni;
+ /* Avoid deleting node while it is been used for
+ * routing
+ */
+ rcu_assign_pointer(rbr->rbr_nodes[nick], new);
+ if (old)
+ rbr_node_put(old);
+ } else {
+ kfree(rbr_ni);
+ }
+ }
return 0;
fail:
pr_warn("rbr_set_data FAILED\n");
--
2.1.4
next prev parent reply other threads:[~2015-09-01 15:53 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-01 15:42 [PATCH RFC v2 00/21] TRILL implementation Ahmed Amamou
2015-09-01 15:42 ` [PATCH RFC v2 01/21] net: rbridge: add trill frame description Ahmed Amamou
2015-09-01 15:42 ` [PATCH RFC v2 02/21] net: rbridge: add layer 2 IS-IS Ethertype Ahmed Amamou
2015-09-01 15:42 ` [PATCH RFC v2 03/21] net: rbridge: add RBridge structure Ahmed Amamou
2015-09-01 15:42 ` [PATCH RFC v2 04/21] net: rbridge: add CONFIG_TRILL Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 05/21] net: rbridge: adapt Bridge structure Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 06/21] net: rbridge: enable/disable TRILL capability Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 07/21] net: rbridge: add sysfs for trill_state Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 08/21] net: rbridge: get Rbridge nickname from daemon Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 09/21] net: rbridge: add elected dtroot Ahmed Amamou
2015-09-01 18:18 ` Sergei Shtylyov
2015-09-01 18:26 ` ahmed amamou
2015-09-01 15:43 ` [PATCH RFC v2 10/21] net: rbridge: add rbr_node management function Ahmed Amamou
2015-09-01 18:30 ` Sergei Shtylyov
2015-09-01 15:43 ` [PATCH RFC v2 11/21] net: rbridge: clean up rbr_node on rbridge stop Ahmed Amamou
2015-09-01 15:43 ` Ahmed Amamou [this message]
2015-09-01 15:43 ` [PATCH RFC v2 13/21] net: rbridge: add basic trill frame handling function Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 14/21] net: rbridge: update forwarding database Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 15/21] net: rbridge: add test on trill flag before flood Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 16/21] net: rbridge: add encapsulation process Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 17/21] net: rbridge: add receive function Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 18/21] net: rbridge: add rbr_fwd Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 19/21] net: rbridge: add rbr_multidest_fwd Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 20/21] net: rbridge: replace net_port rx_handler Ahmed Amamou
2015-09-01 15:43 ` [PATCH RFC v2 21/21] net: handle packet split for trill Ahmed Amamou
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=1441122196-11662-13-git-send-email-ahmed@gandi.net \
--to=ahmed@gandi.net \
--cc=netdev@vger.kernel.org \
--cc=william@gandi.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).