From patchwork Tue Feb 7 09:20:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1507 Return-Path: Received: from nm24.bullet.mail.ukl.yahoo.com (nm24.bullet.mail.ukl.yahoo.com [217.146.177.233]) by open-mesh.org (Postfix) with SMTP id 13B97600857 for ; Tue, 7 Feb 2012 10:21:01 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.180] by nm24.bullet.mail.ukl.yahoo.com with NNFMP; 07 Feb 2012 09:21:00 -0000 Received: from [77.238.184.74] by tm11.bullet.mail.ukl.yahoo.com with NNFMP; 07 Feb 2012 09:21:00 -0000 Received: from [127.0.0.1] by smtp143.mail.ukl.yahoo.com with NNFMP; 07 Feb 2012 09:21:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1328606460; bh=B8CKSxFo1ihm8ZIetlBB4tZbiq6wVOXm53Iy5e6tfAM=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=20KH0ExKNYJSsgK6xL3YFOiTbV8T/vHD2yTAnZydW8vn2s29l+sgsYt0MqhdJngwrAYWK3VoKHEZyZEn9EMXJ5zNIqErO1Zm5NoeU/ec1omzTAmcUym0WzowhZD80xmWghekUdFwSyoIKxwkOJJ6DxzYxmiiVXFTSOStIkixNyA= X-Yahoo-Newman-Id: 624343.3037.bm@smtp143.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: T.yukxwVM1mz9pNGr6m1jmRVLifsYW4NTD_drQv86ZjStL9 PtiAR2ReURxY3nLa9Vyj.h1Qz1j9gldx7dRbjtASylKnt8Y8Ypu9YVNWA0UL S7xXgVm2Gelyi5Tzll6k5yQCw0.gFTnevJHmxztO1bswpIKwDRXuDvCt0qqc NCHu3Gj81pdw0_V7fh1g7msmREUOadnFthJQw_Y4DqYi22n.KOxqtu8lL8iz _7gYxQ3do9NZcQIbRoFPyOyBsxf6OfrZlAD6qBpOLC5yWrXjlocFM.H7nD9U fXlBa1N9BBTO35oTWAEfLtHSqjJ33WUJlGc9Zoe_HaaAY35.iAALNhpmB2Er 4.Sz4LfPNEgrIYO.u46puwoMas_MGviRTzDx5ZEIV1jWxSOgCjuuZU4BLcun yMQ-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp143.mail.ukl.yahoo.com with SMTP; 07 Feb 2012 09:20:59 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 7 Feb 2012 17:20:45 +0800 Message-Id: <1328606451-3418-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <201202071719.22804.lindner_marek@yahoo.de> References: <201202071719.22804.lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 2/8] batman-adv: refactoring API: find generalized name for bat_ogm_init callback X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 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: Tue, 07 Feb 2012 09:21:01 -0000 Signed-off-by: Marek Lindner --- bat_iv_ogm.c | 4 ++-- hard-interface.c | 2 +- main.c | 2 +- types.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) 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 */