From 4e78ff052f90f5b2abf41396fb33b45f66b7a1df Mon Sep 17 00:00:00 2001
From: Marek Lindner <lindner_marek@yahoo.de>
Date: Tue, 7 Feb 2012 17:20:45 +0800
Subject: [PATCH] --- yaml --- r: 300803 b: refs/heads/master c:
 c2aca02235c014de57b03aa725d9b094f7a87cac h: refs/heads/master i:   300801:
 eb98621d0eb8c933720e7d1b7ffc3424167901c2   300799:
 f9d7474607c32f134b790b201b5e8fc32e9a3cfb v: v3

---
 [refs]                                | 2 +-
 trunk/net/batman-adv/bat_iv_ogm.c     | 4 ++--
 trunk/net/batman-adv/hard-interface.c | 2 +-
 trunk/net/batman-adv/main.c           | 2 +-
 trunk/net/batman-adv/types.h          | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 74143433d775..e988e8df191c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8140625e30523da3eb76cdab837ba7aa9509029c
+refs/heads/master: c2aca02235c014de57b03aa725d9b094f7a87cac
diff --git a/trunk/net/batman-adv/bat_iv_ogm.c b/trunk/net/batman-adv/bat_iv_ogm.c
index fab1071f601e..117b8314e8c7 100644
--- a/trunk/net/batman-adv/bat_iv_ogm.c
+++ b/trunk/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/trunk/net/batman-adv/hard-interface.c b/trunk/net/batman-adv/hard-interface.c
index f15200760d65..4d9b85ddd93a 100644
--- a/trunk/net/batman-adv/hard-interface.c
+++ b/trunk/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/trunk/net/batman-adv/main.c b/trunk/net/batman-adv/main.c
index e67ca96285b3..ca8f39547105 100644
--- a/trunk/net/batman-adv/main.c
+++ b/trunk/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/trunk/net/batman-adv/types.h b/trunk/net/batman-adv/types.h
index a5b1a6333def..4b9224829a6c 100644
--- a/trunk/net/batman-adv/types.h
+++ b/trunk/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 */