From 2a58f50c9c25cd8cd7730a5ebaf01c8d13305a08 Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Mon, 11 Feb 2013 17:10:25 +0800 Subject: [PATCH] --- yaml --- r: 368761 b: refs/heads/master c: e07932ae6fb74ef707b2b27762fb0ad8aea4b55f h: refs/heads/master i: 368759: a2124f2d4d4ab7d9e34dbda9cbd724602689f047 v: v3 --- [refs] | 2 +- trunk/net/batman-adv/hard-interface.c | 2 +- trunk/net/batman-adv/soft-interface.c | 6 +++++- trunk/net/batman-adv/soft-interface.h | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e10ade1615fe..55bbe47d8e65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a15fd3612dd95341ad190def7faceebb41d6e346 +refs/heads/master: e07932ae6fb74ef707b2b27762fb0ad8aea4b55f diff --git a/trunk/net/batman-adv/hard-interface.c b/trunk/net/batman-adv/hard-interface.c index 74e3ec2fb116..6c32607a6e93 100644 --- a/trunk/net/batman-adv/hard-interface.c +++ b/trunk/net/batman-adv/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/trunk/net/batman-adv/soft-interface.c b/trunk/net/batman-adv/soft-interface.c index e889bfb1bfc3..bc77a5be960d 100644 --- a/trunk/net/batman-adv/soft-interface.c +++ b/trunk/net/batman-adv/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/trunk/net/batman-adv/soft-interface.h b/trunk/net/batman-adv/soft-interface.h index 43182e5e603a..49bc66bb774a 100644 --- a/trunk/net/batman-adv/soft-interface.h +++ b/trunk/net/batman-adv/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_ */