[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20181123161359.13342-8-sven@narfation.org>
Date: Fri, 23 Nov 2018 17:13:47 +0100
From: Sven Eckelmann <sven@...fation.org>
To: b.a.t.m.a.n@...ts.open-mesh.org
Cc: Jiri Pirko <jiri@...lanox.com>, netdev@...r.kernel.org,
Sven Eckelmann <sven@...fation.org>
Subject: [RFC v2 07/19] batman-adv: Add bonding mesh genl configuration
The mesh interface can use multiple slave/hard-interface ports at the same
time to transport the traffic to other nodes.
The BATADV_CMD_SET_MESH/BATADV_CMD_GET_MESH commands allow to set/get the
configuration of this feature using the BATADV_ATTR_BONDING attribute.
Setting the u8 to zero will disable this feature and setting it to
something else is enabling this feature.
Cc: Jiri Pirko <jiri@...lanox.com>
Signed-off-by: Sven Eckelmann <sven@...fation.org>
---
include/uapi/linux/batman_adv.h | 6 ++++++
net/batman-adv/netlink.c | 11 +++++++++++
2 files changed, 17 insertions(+)
diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index 75738032..d209c468 100644
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -374,6 +374,12 @@ enum batadv_nl_attrs {
*/
BATADV_ATTR_ISOLATION_MASK,
+ /**
+ * @BATADV_ATTR_BONDING: whether the data traffic going through the
+ * mesh will be sent using multiple interfaces at the same time.
+ */
+ BATADV_ATTR_BONDING,
+
/* add attributes above here, update the policy in netlink.c */
/**
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 217c4b30..a836a8f1 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -143,6 +143,7 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {
[BATADV_ATTR_AP_ISOLATION] = { .type = NLA_U8 },
[BATADV_ATTR_ISOLATION_MARK] = { .type = NLA_U32 },
[BATADV_ATTR_ISOLATION_MASK] = { .type = NLA_U32 },
+ [BATADV_ATTR_BONDING] = { .type = NLA_U8 },
};
/**
@@ -278,6 +279,10 @@ static int batadv_netlink_mesh_put(struct sk_buff *msg,
bat_priv->isolation_mark_mask))
goto nla_put_failure;
+ if (nla_put_u8(msg, BATADV_ATTR_BONDING,
+ !!atomic_read(&bat_priv->bonding)))
+ goto nla_put_failure;
+
batadv_hardif_put(primary_if);
genlmsg_end(msg, hdr);
@@ -385,6 +390,12 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info)
bat_priv->isolation_mark_mask = nla_get_u32(attr);
}
+ if (info->attrs[BATADV_ATTR_BONDING]) {
+ attr = info->attrs[BATADV_ATTR_BONDING];
+
+ atomic_set(&bat_priv->bonding, !!nla_get_u8(attr));
+ }
+
batadv_netlink_notify_mesh(bat_priv);
return 0;
--
2.19.1
Powered by blists - more mailing lists