diff mbox

[2/8] batman-adv: refactoring API: find generalized name for bat_ogm_init callback

Message ID 1328606451-3418-1-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Accepted, archived
Commit 7deba897566c8da9d390e969f8a0f2938ba4281d
Headers

Commit Message

Marek Lindner Feb. 7, 2012, 9:20 a.m. UTC 
  Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
 bat_iv_ogm.c     |    4 ++--
 hard-interface.c |    2 +-
 main.c           |    2 +-
 types.h          |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

Comments

Marek Lindner Feb. 12, 2012, 2:58 p.m. UTC | #1 
On Tuesday, February 07, 2012 17:20:45 Marek Lindner wrote:
> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
> ---
>  bat_iv_ogm.c     |    4 ++--
>  hard-interface.c |    2 +-
>  main.c           |    2 +-
>  types.h          |    4 ++--
>  4 files changed, 6 insertions(+), 6 deletions(-)

Applied in revision 7deba89.

Regards,
Marek
diff mbox

Patch

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index bbab00b..3eff7f0 100644
--- a/bat_iv_ogm.c
+++ b/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;
 
@@ -1180,7 +1180,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/hard-interface.c b/hard-interface.c
index e16c996..4052444 100644
--- a/hard-interface.c
+++ b/hard-interface.c
@@ -318,7 +318,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, "Can't add interface packet "
diff --git a/main.c b/main.c
index 7750bca..8bc27e1 100644
--- a/main.c
+++ b/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/types.h b/types.h
index 7f7f610..c78b925 100644
--- a/types.h
+++ b/types.h
@@ -369,8 +369,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 */