From patchwork Sun Jan 13 09:51:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 2671 Return-Path: Received: from nm14-vm6.bullet.mail.sg3.yahoo.com (nm14-vm6.bullet.mail.sg3.yahoo.com [106.10.149.37]) by open-mesh.org (Postfix) with ESMTPS id DC083601B06 for ; Sun, 13 Jan 2013 10:51:32 +0100 (CET) Received: from [106.10.166.119] by nm14.bullet.mail.sg3.yahoo.com with NNFMP; 13 Jan 2013 09:51:30 -0000 Received: from [106.10.167.216] by tm8.bullet.mail.sg3.yahoo.com with NNFMP; 13 Jan 2013 09:51:30 -0000 Received: from [127.0.0.1] by smtp189.mail.sg3.yahoo.com with NNFMP; 13 Jan 2013 09:51:30 -0000 X-Yahoo-Newman-Id: 411605.19751.bm@smtp189.mail.sg3.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 5jX7zvwVM1kJVTjkOoFlyS_fANMpembvWzzXYYJYNcBDrdW 5xdGCt8SFASEJ64rn239652oSskxwM.gyzlTkB1CG_.Q3z1l_Xig2RyOu97D s1WQan0XpuaHwXJBzzSjiMb7Ayy5todixXW5NUy3lq93whpSZV2O7_QGtwKj 1c3yah1Bce9nCnV1LN2CYSrxd_qGi.AzBqwyWT4AqFNhw.K0h9XLQxjV123q mLJ4RmXQJQAnZQYCTN18mHkeNQFaBZSFiLe6HzhgHVmWDdCYzk.WkBaCemF0 i9HZTyAkYttm3sI6PO0rNoVheYwoJbFMe7fjRaI9DqdDvVA0sFnlwFwkuHMe CcMBRZxqV5rBdFXiwrpAwao2_BEH4GJU_12yMyLif0cZ2gw7oMKZomzaggap eK9xMMnP0jR4Wl8ulbwFpnXDIv4M7EJuhix8bINMXUt8z X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@1.36.145.67 with plain) by smtp189.mail.sg3.yahoo.com with SMTP; 13 Jan 2013 01:51:30 -0800 PST From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 13 Jan 2013 17:51:01 +0800 Message-Id: <1358070663-8226-4-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358070663-8226-1-git-send-email-lindner_marek@yahoo.de> References: <201301131750.39338.lindner_marek@yahoo.de> <1358070663-8226-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner , Sven Eckelmann Subject: [B.A.T.M.A.N.] [PATCHv2 4/6] batman-adv: rename batadv_softif_destroy to reflect sysfs use case X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2013 09:51:39 -0000 From: Sven Eckelmann Signed-off-by: Marek Lindner CC: Sven Eckelmann --- hard-interface.c | 2 +- soft-interface.c | 6 +++++- soft-interface.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) 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 d905719..bf19605 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -578,7 +578,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_ */