Skip to content

Commit

Permalink
batman-adv: rename batadv_if_list_entry struct to make clear it is us…
Browse files Browse the repository at this point in the history
…ed by vis

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
  • Loading branch information
Marek Lindner authored and Antonio Quartulli committed Jan 19, 2013
1 parent 2006fea commit 015b4ae
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
19 changes: 10 additions & 9 deletions net/batman-adv/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions net/batman-adv/vis.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,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) {
Expand All @@ -147,7 +147,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) {
Expand Down Expand Up @@ -197,7 +197,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) {
Expand All @@ -223,7 +223,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);
Expand Down

0 comments on commit 015b4ae

Please sign in to comment.