batman-adv: refactoring API: find generalized name for bat_ogm_init callback

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index fab1071f601e2f3ee8177f50114ade7a78f1e5b1..117b8314e8c77a4c3bb6c833ce1c158037b5e89c 100644 (file)
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -30,7 +30,7 @@
 #include "send.h"
 #include "bat_algo.h"
 
-static void bat_iv_ogm_init(struct hard_iface *hard_iface)
+static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface)
 {
        struct batman_ogm_packet *batman_ogm_packet;
 
@@ -1169,7 +1169,7 @@ static void bat_iv_ogm_receive(struct hard_iface *if_incoming,
 
 static struct bat_algo_ops batman_iv __read_mostly = {
        .name = "BATMAN IV",
-       .bat_ogm_init = bat_iv_ogm_init,
+       .bat_iface_enable = bat_iv_ogm_iface_enable,
        .bat_ogm_init_primary = bat_iv_ogm_init_primary,
        .bat_ogm_update_mac = bat_iv_ogm_update_mac,
        .bat_ogm_schedule = bat_iv_ogm_schedule,

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index f15200760d6531b371b7e3568ff3193c2308b06d..4d9b85ddd93abbcd3e85f18936efb8bfb9b229de 100644 (file)
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -312,7 +312,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
        hard_iface->soft_iface = soft_iface;
        bat_priv = netdev_priv(hard_iface->soft_iface);
 
-       bat_priv->bat_algo_ops->bat_ogm_init(hard_iface);
+       bat_priv->bat_algo_ops->bat_iface_enable(hard_iface);
 
        if (!hard_iface->packet_buff) {
                bat_err(hard_iface->soft_iface,

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index e67ca96285b3396ab07a9004f95235fb6a048ddb..ca8f395471057c78a2be06582560a55ccff0a4a4 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -208,7 +208,7 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops)
        }
 
        /* all algorithms must implement all ops (for now) */
-       if (!bat_algo_ops->bat_ogm_init ||
+       if (!bat_algo_ops->bat_iface_enable ||
            !bat_algo_ops->bat_ogm_init_primary ||
            !bat_algo_ops->bat_ogm_update_mac ||
            !bat_algo_ops->bat_ogm_schedule ||

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index a5b1a6333deffdc854a706c91270411007864b40..4b9224829a6c3edffe447c2d131db9ec8067a996 100644 (file)
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -377,8 +377,8 @@ struct recvlist_node {
 struct bat_algo_ops {
        struct hlist_node list;
        char *name;
-       /* init OGM when hard-interface is enabled */
-       void (*bat_ogm_init)(struct hard_iface *hard_iface);
+       /* init routing info when hard-interface is enabled */
+       void (*bat_iface_enable)(struct hard_iface *hard_iface);
        /* init primary OGM when primary interface is selected */
        void (*bat_ogm_init_primary)(struct hard_iface *hard_iface);
        /* init mac addresses of the OGM belonging to this hard-interface */