Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c352421 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-next-for-davem-20180524' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
This feature/cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - Disable batman-adv debugfs by default, by Sven Eckelmann

 - Improve handling mesh nodes with multicast optimizations disabled,
   by Linus Luessing

 - Avoid bool in structs, by Sven Eckelmann

 - Allocate less memory when debugfs is disabled, by Sven Eckelmann

 - Fix batadv_interface_tx return data type, by Luc Van Oostenryck

 - improve link speed handling for virtual interfaces, by Marek Lindner

 - Enable BATMAN V algorithm by default, by Marek Lindner
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 13405468 18cfb44c

net/batman-adv/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ config BATMAN_ADV 
config BATMAN_ADV_BATMAN_V

	bool "B.A.T.M.A.N. V protocol (experimental)"

	depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y)

	default n

	default y

	help

	  This option enables the B.A.T.M.A.N. V protocol, the successor

	  of the currently used B.A.T.M.A.N. IV protocol. The main
@@ -94,13 +94,13 @@ config BATMAN_ADV_DEBUGFS 
	bool "batman-adv debugfs entries"

	depends on BATMAN_ADV

	depends on DEBUG_FS

	default y

	default n

	help

	  Enable this to export routing related debug tables via debugfs.

	  The information for each soft-interface and used hard-interface can be

	  found under batman_adv/



	  If unsure, say Y.

	  If unsure, say N.



config BATMAN_ADV_DEBUG

	bool "B.A.T.M.A.N. debugging"

net/batman-adv/bat_v_elp.c

+14 −1
Original line number Diff line number Diff line
@@ -127,7 +127,20 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) 
	rtnl_lock();

	ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings);

	rtnl_unlock();

	if (ret == 0) {



	/* Virtual interface drivers such as tun / tap interfaces, VLAN, etc

	 * tend to initialize the interface throughput with some value for the

	 * sake of having a throughput number to export via ethtool. This

	 * exported throughput leaves batman-adv to conclude the interface

	 * throughput is genuine (reflecting reality), thus no measurements

	 * are necessary.

	 *

	 * Based on the observation that those interface types also tend to set

	 * the link auto-negotiation to 'off', batman-adv shall check this

	 * setting to differentiate between genuine link throughput information

	 * and placeholders installed by virtual interfaces.

	 */

	if (ret == 0 && link_settings.base.autoneg == AUTONEG_ENABLE) {

		/* link characteristics might change over time */

		if (link_settings.base.duplex == DUPLEX_FULL)

			hard_iface->bat_v.flags |= BATADV_FULL_DUPLEX;

net/batman-adv/main.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#define BATADV_DRIVER_DEVICE "batman-adv"



#ifndef BATADV_SOURCE_VERSION

#define BATADV_SOURCE_VERSION "2018.1"

#define BATADV_SOURCE_VERSION "2018.2"

#endif



/* B.A.T.M.A.N. parameters */

net/batman-adv/multicast.c

+6 −23
Original line number Diff line number Diff line
@@ -815,9 +815,6 @@ static int batadv_mcast_forw_mode_check(struct batadv_priv *bat_priv, 
	if (!atomic_read(&bat_priv->multicast_mode))

		return -EINVAL;



	if (atomic_read(&bat_priv->mcast.num_disabled))

		return -EINVAL;



	switch (ntohs(ethhdr->h_proto)) {

	case ETH_P_IP:

		return batadv_mcast_forw_mode_check_ipv4(bat_priv, skb,
@@ -1183,33 +1180,23 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv, 
{

	bool orig_mcast_enabled = !(flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND);

	u8 mcast_flags = BATADV_NO_FLAGS;

	bool orig_initialized;



	if (orig_mcast_enabled && tvlv_value &&

	    tvlv_value_len >= sizeof(mcast_flags))

		mcast_flags = *(u8 *)tvlv_value;



	if (!orig_mcast_enabled) {

		mcast_flags |= BATADV_MCAST_WANT_ALL_IPV4;

		mcast_flags |= BATADV_MCAST_WANT_ALL_IPV6;

	}



	spin_lock_bh(&orig->mcast_handler_lock);

	orig_initialized = test_bit(BATADV_ORIG_CAPA_HAS_MCAST,

				    &orig->capa_initialized);



	/* If mcast support is turned on decrease the disabled mcast node

	 * counter only if we had increased it for this node before. If this

	 * is a completely new orig_node no need to decrease the counter.

	 */

	if (orig_mcast_enabled &&

	    !test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) {

		if (orig_initialized)

			atomic_dec(&bat_priv->mcast.num_disabled);

		set_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);

	/* If mcast support is being switched off or if this is an initial

	 * OGM without mcast support then increase the disabled mcast

	 * node counter.

	 */

	} else if (!orig_mcast_enabled &&

		   (test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) ||

		    !orig_initialized)) {

		atomic_inc(&bat_priv->mcast.num_disabled);

		   test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities)) {

		clear_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities);

	}
@@ -1595,10 +1582,6 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig) 


	spin_lock_bh(&orig->mcast_handler_lock);



	if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capabilities) &&

	    test_bit(BATADV_ORIG_CAPA_HAS_MCAST, &orig->capa_initialized))

		atomic_dec(&bat_priv->mcast.num_disabled);



	batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);

	batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS);

	batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS);

net/batman-adv/soft-interface.c

+2 −3
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static void batadv_interface_set_rx_mode(struct net_device *dev) 
{

}



static int batadv_interface_tx(struct sk_buff *skb,

static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,

				       struct net_device *soft_iface)

{

	struct ethhdr *ethhdr;
@@ -796,7 +796,6 @@ static int batadv_softif_init_late(struct net_device *dev) 
	bat_priv->mcast.querier_ipv6.shadowing = false;

	bat_priv->mcast.flags = BATADV_NO_FLAGS;

	atomic_set(&bat_priv->multicast_mode, 1);

	atomic_set(&bat_priv->mcast.num_disabled, 0);

	atomic_set(&bat_priv->mcast.num_want_all_unsnoopables, 0);

	atomic_set(&bat_priv->mcast.num_want_all_ipv4, 0);

	atomic_set(&bat_priv->mcast.num_want_all_ipv6, 0);