batman-adv: Add orig_interval mesh genl configuration

The OGM packets are transmitted every orig_interval milliseconds. This
value can be changed using the configuration interface.

The BATADV_CMD_SET_MESH/BATADV_CMD_GET_MESH commands allow to set/get the
configuration of this feature using the u32 BATADV_ATTR_ORIG_INTERVAL
attribute.

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 a4239c147bdeea5b1b9f1ffcab0bec4c5696b741..6bedd4889c373cce964afd3f6a63be6939095b16 100644 (file)
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -471,6 +471,12 @@ enum batadv_nl_attrs {
         */
        BATADV_ATTR_NETWORK_CODING_ENABLED,
 
+       /**
+        * @BATADV_ATTR_ORIG_INTERVAL: defines the interval in milliseconds in
+        *  which batman sends its protocol messages.
+        */
+       BATADV_ATTR_ORIG_INTERVAL,
+
        /* 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 6f01f92e6ab3fc7ae7d874c76448856fc6deb5c6..e25c139ba0e1a7ef213114576c490fdf8ae6e686 100644 (file)
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -158,6 +158,7 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {
        [BATADV_ATTR_LOG_LEVEL]                 = { .type = NLA_U32 },
        [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED]      = { .type = NLA_U8 },
        [BATADV_ATTR_NETWORK_CODING_ENABLED]    = { .type = NLA_U8 },
+       [BATADV_ATTR_ORIG_INTERVAL]             = { .type = NLA_U32 },
 };
 
 /**
@@ -358,6 +359,10 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg,
                goto nla_put_failure;
 #endif /* CONFIG_BATMAN_ADV_NC */
 
+       if (nla_put_u32(msg, BATADV_ATTR_ORIG_INTERVAL,
+                       atomic_read(&bat_priv->orig_interval)))
+               goto nla_put_failure;
+
        if (primary_if)
                batadv_hardif_put(primary_if);
 
@@ -596,6 +601,18 @@ static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info)
        }
 #endif /* CONFIG_BATMAN_ADV_NC */
 
+       if (info->attrs[BATADV_ATTR_ORIG_INTERVAL]) {
+               u32 orig_interval;
+
+               attr = info->attrs[BATADV_ATTR_ORIG_INTERVAL];
+               orig_interval = nla_get_u32(attr);
+
+               orig_interval = min_t(u32, orig_interval, INT_MAX);
+               orig_interval = max_t(u32, orig_interval, 2 * BATADV_JITTER);
+
+               atomic_set(&bat_priv->orig_interval, orig_interval);
+       }
+
        batadv_netlink_notify_mesh(bat_priv);
 
        return 0;