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_ENABLED
attribute. Setting the u8 to zero will disable this feature and setting it
to something else is enabling this feature.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index a4dadafe08dd0e8ebea125781f7de610441da7b9..f74ff261ec8fb0b29d81fa3cb85308a3cf612161 100644 (file)
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -375,6 +375,12 @@ enum batadv_nl_attrs {
         */
        BATADV_ATTR_ISOLATION_MASK,
 
+       /**
+        * @BATADV_ATTR_BONDING_ENABLED: whether the data traffic going through
+        *  the mesh will be sent using multiple interfaces at the same time.
+        */
+       BATADV_ATTR_BONDING_ENABLED,
+
        /* 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 fc80f003ed6e7e92ff0ca688d391fdf21540461a..310a2c339fd1a3c4f1e15131148d79071c409510 100644 (file)
--- 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_ENABLED]      = { .type = NLA_U8 },
        [BATADV_ATTR_ISOLATION_MARK]            = { .type = NLA_U32 },
        [BATADV_ATTR_ISOLATION_MASK]            = { .type = NLA_U32 },
+       [BATADV_ATTR_BONDING_ENABLED]           = { .type = NLA_U8 },
 };
 
 /**
@@ -279,6 +280,10 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg,
                        bat_priv->isolation_mark_mask))
                goto nla_put_failure;
 
+       if (nla_put_u8(msg, BATADV_ATTR_BONDING_ENABLED,
+                      !!atomic_read(&bat_priv->bonding)))
+               goto nla_put_failure;
+
        if (primary_if)
                batadv_hardif_put(primary_if);
 
@@ -387,6 +392,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_ENABLED]) {
+               attr = info->attrs[BATADV_ATTR_BONDING_ENABLED];
+
+               atomic_set(&bat_priv->bonding, !!nla_get_u8(attr));
+       }
+
        batadv_netlink_notify_mesh(bat_priv);
 
        return 0;