Commit 9ab4cee5 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: Add aggregated_ogms mesh genl configuration 



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: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 49e7e37c

include/uapi/linux/batman_adv.h

+6 −0
Original line number Diff line number Diff line
@@ -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 */



	/**

net/batman-adv/netlink.c

+12 −0
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE