From patchwork Tue Dec 25 09:03:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 2637 Return-Path: Received: from nm9.bullet.mail.ukl.yahoo.com (nm9.bullet.mail.ukl.yahoo.com [217.146.182.250]) by open-mesh.org (Postfix) with ESMTPS id 0B36C601A03 for ; Tue, 25 Dec 2012 10:04:01 +0100 (CET) Received: from [217.12.10.82] by nm9.bullet.mail.ukl.yahoo.com with NNFMP; 25 Dec 2012 09:04:01 -0000 Received: from [217.146.183.129] by tm16.bullet.mail.ukl.yahoo.com with NNFMP; 25 Dec 2012 09:04:01 -0000 Received: from [127.0.0.1] by smtp114.mail.ukl.yahoo.com with NNFMP; 25 Dec 2012 09:04:01 -0000 X-Yahoo-Newman-Id: 331649.64548.bm@smtp114.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: .rmnRNIVM1kmFsOlYSS.Ke2abqjckg1dGIwV28VsWwjwAOi GSXX6NB7dH52upOcl2EJT1LpjW9L5g6vcOr7.9F8GJnn6i_aogWR.C8mWV46 Fdwzd_.lRGOn1pQXuNktFpykZEkBWJlGWyOZ2g5exgSUPbIPViXQvwzkSzfw t3lCawHfqAeHkN2HLDie_nOB.OJyDvQRXAR4sHRTrP2oADcQM.athnaJt1Sf Qqu9TbVfl1wD5Tj_qEVbyijwDS0hLCCNrpOlExQABaJkjq6R.tOXUHKgq2Vj kHPErOZbBgZ2iNhIRaZXEltvA2VEX0pRhO8sL.TXvSKwy4I_w54SNB4OGbHA OAcvFWZ0Njjwt7DopqPcter9PJDF9Hn8oa27BYRDx8Kjxq3SIIeoqQVT3e.V E8TTeU9YSraZc2e9rxsMw3SzKGVHUUaasVsTm4ZN0QIxLjRCzoI1pUwEVgWt T6wiBVytZWBox.UoMCYBi X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@79.205.251.202 with plain) by smtp114.mail.ukl.yahoo.com with SMTP; 25 Dec 2012 01:04:01 -0800 PST From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 25 Dec 2012 17:03:22 +0800 Message-Id: <1356426206-8667-4-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356426206-8667-1-git-send-email-lindner_marek@yahoo.de> References: <1356426206-8667-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 4/8] batman-adv: rename batadv_if_list_entry struct to make clear it is used by vis X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 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, 25 Dec 2012 09:04:02 -0000 Signed-off-by: Marek Lindner --- types.h | 19 ++++++++++--------- vis.c | 8 ++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/types.h b/types.h index 9a66115..d17517c 100644 --- a/types.h +++ b/types.h @@ -426,15 +426,6 @@ struct batadv_forw_packet { struct batadv_hard_iface *if_incoming; }; -/* While scanning for vis-entries of a particular vis-originator - * this list collects its interfaces to create a subgraph/cluster - * out of them later - */ -struct batadv_if_list_entry { - uint8_t addr[ETH_ALEN]; - bool primary; - struct hlist_node list; -}; struct batadv_frag_packet_list_entry { struct list_head list; uint16_t seqno; @@ -467,6 +458,16 @@ struct batadv_recvlist_node { uint8_t mac[ETH_ALEN]; }; +/* While scanning for vis-entries of a particular vis-originator + * this list collects its interfaces to create a subgraph/cluster + * out of them later + */ +struct batadv_vis_if_list_entry { + uint8_t addr[ETH_ALEN]; + bool primary; + struct hlist_node list; +}; + struct batadv_algo_ops { struct hlist_node list; char *name; diff --git a/vis.c b/vis.c index 60eb9b7..f7c25ce 100644 --- a/vis.c +++ b/vis.c @@ -129,7 +129,7 @@ static void batadv_vis_data_insert_interface(const uint8_t *interface, struct hlist_head *if_list, bool primary) { - struct batadv_if_list_entry *entry; + struct batadv_vis_if_list_entry *entry; struct hlist_node *pos; hlist_for_each_entry(entry, pos, if_list, list) { @@ -149,7 +149,7 @@ static void batadv_vis_data_insert_interface(const uint8_t *interface, static void batadv_vis_data_read_prim_sec(struct seq_file *seq, const struct hlist_head *if_list) { - struct batadv_if_list_entry *entry; + struct batadv_vis_if_list_entry *entry; struct hlist_node *pos; hlist_for_each_entry(entry, pos, if_list, list) { @@ -199,7 +199,7 @@ static void batadv_vis_data_read_entries(struct seq_file *seq, struct batadv_vis_info_entry *entries) { int i; - struct batadv_if_list_entry *entry; + struct batadv_vis_if_list_entry *entry; struct hlist_node *pos; hlist_for_each_entry(entry, pos, list, list) { @@ -225,7 +225,7 @@ static void batadv_vis_seq_print_text_bucket(struct seq_file *seq, struct batadv_vis_packet *packet; uint8_t *entries_pos; struct batadv_vis_info_entry *entries; - struct batadv_if_list_entry *entry; + struct batadv_vis_if_list_entry *entry; struct hlist_node *pos, *n; HLIST_HEAD(vis_if_list);