diff mbox

[v3,4/6] batman-adv: rename batadv_softif_destroy to reflect sysfs use case

Message ID 1360573828-24399-4-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Marek Lindner Feb. 11, 2013, 9:10 a.m. UTC 
  Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
CC: Sven Eckelmann <sven@narfation.org>
---
 hard-interface.c |    2 +-
 soft-interface.c |    6 +++++-
 soft-interface.h |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

Comments

Marek Lindner Feb. 16, 2013, 9:17 a.m. UTC | #1 
On Monday, February 11, 2013 17:10:25 Marek Lindner wrote:
> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
> CC: Sven Eckelmann <sven@narfation.org>
> ---
>  hard-interface.c |    2 +-
>  soft-interface.c |    6 +++++-
>  soft-interface.h |    2 +-
>  3 files changed, 7 insertions(+), 3 deletions(-)

Applied in revision b047bd8.

Cheers,
Marek
diff mbox

Patch

diff --git a/hard-interface.c b/hard-interface.c
index 74e3ec2..6c32607 100644
--- a/hard-interface.c
+++ b/hard-interface.c
@@ -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);
diff --git a/soft-interface.c b/soft-interface.c
index e889bfb..bc77a5b 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -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);
 
diff --git a/soft-interface.h b/soft-interface.h
index 43182e5..49bc66b 100644
--- a/soft-interface.h
+++ b/soft-interface.h
@@ -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_ */