From patchwork Thu May 10 06:01:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1852 Return-Path: Received: from nm23-vm3.bullet.mail.ukl.yahoo.com (nm23-vm3.bullet.mail.ukl.yahoo.com [217.146.177.142]) by open-mesh.org (Postfix) with SMTP id B1E3E600742 for ; Thu, 10 May 2012 08:01:46 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.211] by nm23.bullet.mail.ukl.yahoo.com with NNFMP; 10 May 2012 06:01:46 -0000 Received: from [77.238.184.76] by tm4.bullet.mail.ukl.yahoo.com with NNFMP; 10 May 2012 06:01:46 -0000 Received: from [127.0.0.1] by smtp145.mail.ukl.yahoo.com with NNFMP; 10 May 2012 06:01:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1336629706; bh=89Eum8YeLqTcPh9yXyhGJ3O/yMfmsNbZ/Khkg+q71D0=; 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; b=zOD1zhSiFjZlC91BAM4iAblESmd1zvUoLxmOCUAi3Hn8t7AMGievvopBxvmnUlMN4u2V39vOzhz9EyiF80Sv1ksuqhal37JW2Ecaw1tbf112LJmY7mGJcdzYM49PVe3uzKlIbGoKEFxoJWbd+8punB7NW82TWaraGoo8MZz9vcg= X-Yahoo-Newman-Id: 105791.20845.bm@smtp145.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: hGFxAKkVM1mkJhk63WGigmDoGCy9Ai.hELQ2e_stRC4AZx5 f3mjGsNDUOjhNcqrqc1CjspfRup7hQ9xD7SttK9IRcnAokZk8wmeSxrWxCAG whwkggMr3XO3zhch5qHKKrcwSuYhNn6EmO2ESnJbOYsaaAbY94Junl7Fe09J gEtIWauBZfqijsUZKAOAsH69uRMKfHVrIyjDBThoOhW6Tx5KgXedWT1AMct7 gsCRcxqUyILpLb44utsT0t.wrEEeclBqgKK9Nsmt6fG6IeqVkEpw5CkA0hny yzvFLj367wEHmmjclUfcwaSX9RCzT1iNefwEKIrlVkRbZMWjtmXcVkD9nlES FLRVOflHIffdLA2wc1exUTbCrmGfzaZbefjxMNEgYWAr646txm44IamQ5J7y dag-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp145.mail.ukl.yahoo.com with SMTP; 10 May 2012 06:01:44 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 10 May 2012 14:01:32 +0800 Message-Id: <1336629692-32288-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.9.1 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batman_adv: fix namespace for neigh_node_new function 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: Thu, 10 May 2012 06:01:47 -0000 Should be merged with 0c9a249ef4dcaf733f6c7f64d4ce5c97b4705968 Signed-off-by: Marek Lindner --- bat_iv_ogm.c | 2 +- originator.c | 5 +++-- originator.h | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 837c8a6..24b510f 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -38,7 +38,7 @@ static struct neigh_node *bat_iv_ogm_neigh_new(struct hard_iface *hard_iface, { struct neigh_node *neigh_node; - neigh_node = neigh_node_new(hard_iface, neigh_addr, seqno); + neigh_node = batman_adv_neigh_node_new(hard_iface, neigh_addr, seqno); if (!neigh_node) goto out; diff --git a/originator.c b/originator.c index 30889c9..504b4cd 100644 --- a/originator.c +++ b/originator.c @@ -86,8 +86,9 @@ struct neigh_node *orig_node_get_router(struct orig_node *orig_node) return router; } -struct neigh_node *neigh_node_new(struct hard_iface *hard_iface, - const uint8_t *neigh_addr, uint32_t seqno) +struct neigh_node *batman_adv_neigh_node_new(struct hard_iface *hard_iface, + const uint8_t *neigh_addr, + uint32_t seqno) { struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct neigh_node *neigh_node; diff --git a/originator.h b/originator.h index 64c5d94..fd37ba0 100644 --- a/originator.h +++ b/originator.h @@ -29,8 +29,9 @@ void originator_free(struct bat_priv *bat_priv); void purge_orig_ref(struct bat_priv *bat_priv); void orig_node_free_ref(struct orig_node *orig_node); struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr); -struct neigh_node *neigh_node_new(struct hard_iface *hard_iface, - const uint8_t *neigh_addr, uint32_t seqno); +struct neigh_node *batman_adv_neigh_node_new(struct hard_iface *hard_iface, + const uint8_t *neigh_addr, + uint32_t seqno); void neigh_node_free_ref(struct neigh_node *neigh_node); struct neigh_node *orig_node_get_router(struct orig_node *orig_node); int orig_seq_print_text(struct seq_file *seq, void *offset);