aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/vis.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/vis.c')
-rw-r--r--net/batman-adv/vis.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index 9832d8f9ed44..fc9732967dbd 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -75,7 +75,7 @@ static int vis_info_cmp(void *data1, void *data2)
75 d2 = data2; 75 d2 = data2;
76 p1 = (struct vis_packet *)d1->skb_packet->data; 76 p1 = (struct vis_packet *)d1->skb_packet->data;
77 p2 = (struct vis_packet *)d2->skb_packet->data; 77 p2 = (struct vis_packet *)d2->skb_packet->data;
78 return compare_orig(p1->vis_orig, p2->vis_orig); 78 return compare_eth(p1->vis_orig, p2->vis_orig);
79} 79}
80 80
81/* hash function to choose an entry in a hash table of given size */ 81/* hash function to choose an entry in a hash table of given size */
@@ -113,7 +113,7 @@ static void vis_data_insert_interface(const uint8_t *interface,
113 struct hlist_node *pos; 113 struct hlist_node *pos;
114 114
115 hlist_for_each_entry(entry, pos, if_list, list) { 115 hlist_for_each_entry(entry, pos, if_list, list) {
116 if (compare_orig(entry->addr, (void *)interface)) 116 if (compare_eth(entry->addr, (void *)interface))
117 return; 117 return;
118 } 118 }
119 119
@@ -165,7 +165,7 @@ static ssize_t vis_data_read_entry(char *buff, struct vis_info_entry *entry,
165 /* maximal length: max(4+17+2, 3+17+1+3+2) == 26 */ 165 /* maximal length: max(4+17+2, 3+17+1+3+2) == 26 */
166 if (primary && entry->quality == 0) 166 if (primary && entry->quality == 0)
167 return sprintf(buff, "HNA %pM, ", entry->dest); 167 return sprintf(buff, "HNA %pM, ", entry->dest);
168 else if (compare_orig(entry->src, src)) 168 else if (compare_eth(entry->src, src))
169 return sprintf(buff, "TQ %pM %d, ", entry->dest, 169 return sprintf(buff, "TQ %pM %d, ", entry->dest,
170 entry->quality); 170 entry->quality);
171 171
@@ -212,7 +212,7 @@ int vis_seq_print_text(struct seq_file *seq, void *offset)
212 if (entries[j].quality == 0) 212 if (entries[j].quality == 0)
213 continue; 213 continue;
214 compare = 214 compare =
215 compare_orig(entries[j].src, packet->vis_orig); 215 compare_eth(entries[j].src, packet->vis_orig);
216 vis_data_insert_interface(entries[j].src, 216 vis_data_insert_interface(entries[j].src,
217 &vis_if_list, 217 &vis_if_list,
218 compare); 218 compare);
@@ -222,7 +222,7 @@ int vis_seq_print_text(struct seq_file *seq, void *offset)
222 buf_size += 18 + 26 * packet->entries; 222 buf_size += 18 + 26 * packet->entries;
223 223
224 /* add primary/secondary records */ 224 /* add primary/secondary records */
225 if (compare_orig(entry->addr, packet->vis_orig)) 225 if (compare_eth(entry->addr, packet->vis_orig))
226 buf_size += 226 buf_size +=
227 vis_data_count_prim_sec(&vis_if_list); 227 vis_data_count_prim_sec(&vis_if_list);
228 228
@@ -258,7 +258,7 @@ int vis_seq_print_text(struct seq_file *seq, void *offset)
258 if (entries[j].quality == 0) 258 if (entries[j].quality == 0)
259 continue; 259 continue;
260 compare = 260 compare =
261 compare_orig(entries[j].src, packet->vis_orig); 261 compare_eth(entries[j].src, packet->vis_orig);
262 vis_data_insert_interface(entries[j].src, 262 vis_data_insert_interface(entries[j].src,
263 &vis_if_list, 263 &vis_if_list,
264 compare); 264 compare);
@@ -276,7 +276,7 @@ int vis_seq_print_text(struct seq_file *seq, void *offset)
276 entry->primary); 276 entry->primary);
277 277
278 /* add primary/secondary records */ 278 /* add primary/secondary records */
279 if (compare_orig(entry->addr, packet->vis_orig)) 279 if (compare_eth(entry->addr, packet->vis_orig))
280 buff_pos += 280 buff_pos +=
281 vis_data_read_prim_sec(buff + buff_pos, 281 vis_data_read_prim_sec(buff + buff_pos,
282 &vis_if_list); 282 &vis_if_list);
@@ -344,7 +344,7 @@ static int recv_list_is_in(struct bat_priv *bat_priv,
344 344
345 spin_lock_bh(&bat_priv->vis_list_lock); 345 spin_lock_bh(&bat_priv->vis_list_lock);
346 list_for_each_entry(entry, recv_list, list) { 346 list_for_each_entry(entry, recv_list, list) {
347 if (memcmp(entry->mac, mac, ETH_ALEN) == 0) { 347 if (compare_eth(entry->mac, mac)) {
348 spin_unlock_bh(&bat_priv->vis_list_lock); 348 spin_unlock_bh(&bat_priv->vis_list_lock);
349 return 1; 349 return 1;
350 } 350 }
@@ -617,7 +617,7 @@ static int generate_vis_packet(struct bat_priv *bat_priv)
617 if (!neigh_node) 617 if (!neigh_node)
618 continue; 618 continue;
619 619
620 if (!compare_orig(neigh_node->addr, orig_node->orig)) 620 if (!compare_eth(neigh_node->addr, orig_node->orig))
621 continue; 621 continue;
622 622
623 if (neigh_node->if_incoming->if_status != IF_ACTIVE) 623 if (neigh_node->if_incoming->if_status != IF_ACTIVE)