batman-adv: refactoring API: find generalized name for bat_ogm_init_primary 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 271467033a1c6d9c31426bb35d0f86399aff649f..c0bdb90cc024445a89f7853608782a1a33775c4d 100644 (file)
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -67,7 +67,7 @@ static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface)
        hard_iface->packet_buff = NULL;
 }
 
-static void bat_iv_ogm_init_primary(struct hard_iface *hard_iface)
+static void bat_iv_ogm_primary_iface_set(struct hard_iface *hard_iface)
 {
        struct batman_ogm_packet *batman_ogm_packet;
 
@@ -1191,7 +1191,7 @@ static struct bat_algo_ops batman_iv __read_mostly = {
        .name = "BATMAN IV",
        .bat_iface_enable = bat_iv_ogm_iface_enable,
        .bat_iface_disable = bat_iv_ogm_iface_disable,
-       .bat_ogm_init_primary = bat_iv_ogm_init_primary,
+       .bat_primary_iface_set = bat_iv_ogm_primary_iface_set,
        .bat_ogm_update_mac = bat_iv_ogm_update_mac,
        .bat_ogm_schedule = bat_iv_ogm_schedule,
        .bat_ogm_emit = bat_iv_ogm_emit,

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 3b391fd3b5b2fdadbf4d74a8bbc2af5cda992031..75a555b8587ebaf35d1062bb7883f94725808f4a 100644 (file)
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -146,7 +146,7 @@ static void primary_if_select(struct bat_priv *bat_priv,
        if (!new_hard_iface)
                goto out;
 
-       bat_priv->bat_algo_ops->bat_ogm_init_primary(new_hard_iface);
+       bat_priv->bat_algo_ops->bat_primary_iface_set(new_hard_iface);
        primary_if_update_addr(bat_priv, curr_hard_iface);
 
 out:

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index a47a6ced1cb7cd552eb9e37c54fd2e4309042890..791327219531c8a907a23cb54e4091401d15a7c2 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -210,7 +210,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_iface_enable ||
            !bat_algo_ops->bat_iface_disable ||
-           !bat_algo_ops->bat_ogm_init_primary ||
+           !bat_algo_ops->bat_primary_iface_set ||
            !bat_algo_ops->bat_ogm_update_mac ||
            !bat_algo_ops->bat_ogm_schedule ||
            !bat_algo_ops->bat_ogm_emit ||

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index dd78023800bd1efc067eead5ab270959cb890b19..4d93aad899f7637a68c91c9d52d31583fcf5df5b 100644 (file)
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -381,8 +381,8 @@ struct bat_algo_ops {
        int (*bat_iface_enable)(struct hard_iface *hard_iface);
        /* de-init routing info when hard-interface is disabled */
        void (*bat_iface_disable)(struct hard_iface *hard_iface);
-       /* init primary OGM when primary interface is selected */
-       void (*bat_ogm_init_primary)(struct hard_iface *hard_iface);
+       /* called when primary interface is selected / changed */
+       void (*bat_primary_iface_set)(struct hard_iface *hard_iface);
        /* init mac addresses of the OGM belonging to this hard-interface */
        void (*bat_ogm_update_mac)(struct hard_iface *hard_iface);
        /* prepare a new outgoing OGM for the send queue */