Commit a15fd361 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Don't always delete softif when last slave was removed 



batman-adv has an unusual way to manage softinterfaces. These will be created
automatically when a user writes to the batman-adv/mesh_iface file in sysfs and
removed when no slave device exists anymore.

This behaviour cannot be changed without breaking compatibility with existing
code. Instead other interfaces should be able to slightly reduce this behaviour
and provide a more common reaction to a removal of a slave interface.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Acked-by: default avatarAntonio Quartulli <ordex@autistici.org>
Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
parent b3246020

net/batman-adv/hard-interface.c

+5 −3
Original line number Diff line number Diff line
@@ -408,7 +408,8 @@ err: 
	return ret;

}



void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface)

void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,

				     enum batadv_hard_if_cleanup autodel)

{

	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);

	struct batadv_hard_iface *primary_if = NULL;
@@ -446,7 +447,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface) 
	dev_put(hard_iface->soft_iface);



	/* nobody uses this interface anymore */

	if (!bat_priv->num_ifaces)

	if (!bat_priv->num_ifaces && autodel == BATADV_IF_CLEANUP_AUTO)

		batadv_softif_destroy(hard_iface->soft_iface);



	hard_iface->soft_iface = NULL;
@@ -533,7 +534,8 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) 


	/* first deactivate interface */

	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)

		batadv_hardif_disable_interface(hard_iface);

		batadv_hardif_disable_interface(hard_iface,

						BATADV_IF_CLEANUP_AUTO);



	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)

		return;

net/batman-adv/hard-interface.h

+12 −1
Original line number Diff line number Diff line
@@ -29,13 +29,24 @@ enum batadv_hard_if_state { 
	BATADV_IF_I_WANT_YOU,

};



/**

 * enum batadv_hard_if_cleanup - Cleanup modi for soft_iface after slave removal

 * @BATADV_IF_CLEANUP_KEEP: Don't automatically delete soft-interface

 * @BATADV_IF_CLEANUP_AUTO: Delete soft-interface after last slave was removed

 */

enum batadv_hard_if_cleanup {

	BATADV_IF_CLEANUP_KEEP,

	BATADV_IF_CLEANUP_AUTO,

};



extern struct notifier_block batadv_hard_if_notifier;



struct batadv_hard_iface*

batadv_hardif_get_by_netdev(const struct net_device *net_dev);

int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,

				   const char *iface_name);

void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface);

void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,

				     enum batadv_hard_if_cleanup autodel);

void batadv_hardif_remove_interfaces(void);

int batadv_hardif_min_mtu(struct net_device *soft_iface);

void batadv_update_min_mtu(struct net_device *soft_iface);

net/batman-adv/sysfs.c

+4 −2
Original line number Diff line number Diff line
@@ -588,13 +588,15 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, 
	}



	if (status_tmp == BATADV_IF_NOT_IN_USE) {

		batadv_hardif_disable_interface(hard_iface);

		batadv_hardif_disable_interface(hard_iface,

						BATADV_IF_CLEANUP_AUTO);

		goto unlock;

	}



	/* if the interface already is in use */

	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)

		batadv_hardif_disable_interface(hard_iface);

		batadv_hardif_disable_interface(hard_iface,

						BATADV_IF_CLEANUP_AUTO);



	ret = batadv_hardif_enable_interface(hard_iface, buff);

CRA Git | Maintained and supported by SUSTech CRA and CCSE