From patchwork Thu May 10 16:49:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1849 Return-Path: Received: from nm2.bullet.mail.ukl.yahoo.com (nm2.bullet.mail.ukl.yahoo.com [217.146.183.219]) by open-mesh.org (Postfix) with SMTP id 97D87600754 for ; Thu, 10 May 2012 18:49:50 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.181] by nm2.bullet.mail.ukl.yahoo.com with NNFMP; 10 May 2012 16:49:50 -0000 Received: from [77.238.184.72] by tm12.bullet.mail.ukl.yahoo.com with NNFMP; 10 May 2012 16:49:50 -0000 Received: from [127.0.0.1] by smtp141.mail.ukl.yahoo.com with NNFMP; 10 May 2012 16:49:50 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1336668590; bh=XpoS9V7ePfeqYlVKzWn/j87cpQIpifFKgOPu5V8+go4=; 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=e/G1cafl+5lYVZbetT98En731JDishMz0RqW8dZ7ZRirncCh36ux6NSmVYHwuLxqAeijmYqLNeaHLMlzvfavBbfCxFLA190pafyh30bQaNTwu+lGb0VdutncLQSaWFUDaRegYkpm5KPRBGQw9dWb97nMN2MlrsZfCy/kSy5WgMA= X-Yahoo-Newman-Id: 395583.52224.bm@smtp141.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: wOk5NRgVM1l2JjXMiLx4qUshCBOGZeR_J9NLTI4uQMc97SE qhM3f0r8kkhzHVYXeJ2NJKtWyIfc1G_nBFAl40UGe2zYbSv9ruBG6bLIVpJG qravqGADjju0r6AT29wNF4efMuLrSKHLgFYP2JZePfmPFaF_zGR42ByttlrX C1gcp4q5txtfv25i41f0rZ_QBBoC.r5dwxH9.KhtSfete5ddm7QbGTk_z7de Y7W4D3EZcc9V41II7G3KQuLrKYr9Cs8ZJSzeFjXhVlP.phU0ixYzfK6sAl1t .WGYu8.cU2JbrdR6X44ihLokfNWJ65Iv2SogcsDW.goLP1PGVGcUifcE8_zW 69WhjrZwhOAt78jZOzgfjlUO0S74wdQzD.sALRKesJUp9tnhL3LCtko7bszF DaQ-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp141.mail.ukl.yahoo.com with SMTP; 10 May 2012 16:49:49 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 11 May 2012 00:49:34 +0800 Message-Id: <1336668574-16655-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1336629692-32288-1-git-send-email-lindner_marek@yahoo.de> References: <1336629692-32288-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCHv2] 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 16:49:50 -0000 Should be merged with 0c9a249ef4dcaf733f6c7f64d4ce5c97b4705968 Signed-off-by: Marek Lindner --- - v2: renamed batman_adv prefix to batadv. 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..984cafe 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 = batadv_neigh_node_new(hard_iface, neigh_addr, seqno); if (!neigh_node) goto out; diff --git a/originator.c b/originator.c index 30889c9..c6a00b3 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 *batadv_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..f74d0d6 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 *batadv_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);