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

Commit e07932ae authored by Marek Lindner's avatar Marek Lindner Committed by Antonio Quartulli
Browse files

batman-adv: rename batadv_softif_destroy to reflect sysfs use case 



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

net/batman-adv/hard-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, 


	/* nobody uses this interface anymore */

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

		batadv_softif_destroy(hard_iface->soft_iface);

		batadv_softif_destroy_sysfs(hard_iface->soft_iface);



	hard_iface->soft_iface = NULL;

	batadv_hardif_free_ref(hard_iface);

net/batman-adv/soft-interface.c

+5 −1
Original line number Diff line number Diff line
@@ -581,7 +581,11 @@ struct net_device *batadv_softif_create(const char *name) 
	return soft_iface;

}



void batadv_softif_destroy(struct net_device *soft_iface)

/**

 * batadv_softif_destroy_sysfs - deletion of batadv_soft_interface via sysfs

 * @soft_iface: the to-be-removed batman-adv interface

 */

void batadv_softif_destroy_sysfs(struct net_device *soft_iface)

{

	struct batadv_priv *bat_priv = netdev_priv(soft_iface);

net/batman-adv/soft-interface.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ void batadv_interface_rx(struct net_device *soft_iface, 
			 struct sk_buff *skb, struct batadv_hard_iface *recv_if,

			 int hdr_size, struct batadv_orig_node *orig_node);

struct net_device *batadv_softif_create(const char *name);

void batadv_softif_destroy(struct net_device *soft_iface);

void batadv_softif_destroy_sysfs(struct net_device *soft_iface);

int batadv_softif_is_valid(const struct net_device *net_dev);



#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */