From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Sven Eckelmann <sven@narfation.org>,
Simon Wunderlich <sw@simonwunderlich.de>
Subject: [PATCH 07/21] batman-adv: Add aggregated_ogms mesh genl configuration
Date: Wed, 13 Feb 2019 10:55:10 +0100 [thread overview]
Message-ID: <20190213095524.10147-8-sw@simonwunderlich.de> (raw)
In-Reply-To: <20190213095524.10147-1-sw@simonwunderlich.de>
From: Sven Eckelmann <sven@narfation.org>
The mesh interface can delay OGM messages to aggregate different ogms
together in a single OGM packet.
The BATADV_CMD_SET_MESH/BATADV_CMD_GET_MESH commands allow to set/get the
configuration of this feature using the BATADV_ATTR_AGGREGATED_OGMS_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>
---
include/uapi/linux/batman_adv.h | 6 ++++++
net/batman-adv/netlink.c | 12 ++++++++++++
2 files changed, 18 insertions(+)
diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index 10f3cc34fe16..f8941e80d6b4 100644
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -350,6 +350,12 @@ enum batadv_nl_attrs {
*/
BATADV_ATTR_VLANID,
+ /**
+ * @BATADV_ATTR_AGGREGATED_OGMS_ENABLED: whether the batman protocol
+ * messages of the mesh interface shall be aggregated or not.
+ */
+ BATADV_ATTR_AGGREGATED_OGMS_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 d40913bb9031..82665dc2eb2b 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -139,6 +139,7 @@ static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {
[BATADV_ATTR_MCAST_FLAGS] = { .type = NLA_U32 },
[BATADV_ATTR_MCAST_FLAGS_PRIV] = { .type = NLA_U32 },
[BATADV_ATTR_VLANID] = { .type = NLA_U16 },
+ [BATADV_ATTR_AGGREGATED_OGMS_ENABLED] = { .type = NLA_U8 },
};
/**
@@ -214,6 +215,10 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg,
goto nla_put_failure;
}
+ if (nla_put_u8(msg, BATADV_ATTR_AGGREGATED_OGMS_ENABLED,
+ !!atomic_read(&bat_priv->aggregated_ogms)))
+ goto nla_put_failure;
+
if (primary_if)
batadv_hardif_put(primary_if);
@@ -296,6 +301,13 @@ static int batadv_netlink_get_mesh(struct sk_buff *skb, struct genl_info *info)
static int batadv_netlink_set_mesh(struct sk_buff *skb, struct genl_info *info)
{
struct batadv_priv *bat_priv = info->user_ptr[0];
+ struct nlattr *attr;
+
+ if (info->attrs[BATADV_ATTR_AGGREGATED_OGMS_ENABLED]) {
+ attr = info->attrs[BATADV_ATTR_AGGREGATED_OGMS_ENABLED];
+
+ atomic_set(&bat_priv->aggregated_ogms, !!nla_get_u8(attr));
+ }
batadv_netlink_notify_mesh(bat_priv);
--
2.11.0
next prev parent reply other threads:[~2019-02-13 9:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-13 9:55 [PATCH 00/21] pull request for net-next: batman-adv 2019-02-13 Simon Wunderlich
2019-02-13 9:55 ` [PATCH 01/21] batman-adv: fix memory leak in in batadv_dat_put_dhcp Simon Wunderlich
2019-02-13 9:55 ` [PATCH 02/21] batman-adv: Fix typo "reseved" -> "reserved" Simon Wunderlich
2019-02-13 9:55 ` [PATCH 03/21] batman-adv: Move common genl doit code pre/post hooks Simon Wunderlich
2019-02-13 9:55 ` [PATCH 04/21] batman-adv: Prepare framework for mesh genl config Simon Wunderlich
2019-02-13 9:55 ` [PATCH 05/21] batman-adv: Prepare framework for hardif " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 06/21] batman-adv: Prepare framework for vlan " Simon Wunderlich
2019-02-13 9:55 ` Simon Wunderlich [this message]
2019-02-13 9:55 ` [PATCH 08/21] batman-adv: Add ap_isolation mesh/vlan genl configuration Simon Wunderlich
2019-02-13 9:55 ` [PATCH 09/21] batman-adv: Add bonding mesh " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 10/21] batman-adv: Add bridge_loop_avoidance " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 11/21] batman-adv: Add distributed_arp_table " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 12/21] batman-adv: Add fragmentation " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 13/21] batman-adv: Add gateway " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 14/21] batman-adv: Add hop_penalty " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 15/21] batman-adv: Add log_level " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 16/21] batman-adv: Add multicast forceflood " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 17/21] batman-adv: Add network_coding " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 18/21] batman-adv: Add orig_interval " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 19/21] batman-adv: Add elp_interval hardif " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 20/21] batman-adv: Add throughput_override " Simon Wunderlich
2019-02-13 9:55 ` [PATCH 21/21] batman-adv: Trigger genl notification on sysfs config change Simon Wunderlich
2019-02-14 6:28 ` [PATCH 00/21] pull request for net-next: batman-adv 2019-02-13 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=20190213095524.10147-8-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sven@narfation.org \
/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