diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/batman-adv/types.h | 2 | ||||
-rw-r--r-- | net/batman-adv/vis.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index d17517c79d3c..c56e0d904dac 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h | |||
@@ -453,7 +453,7 @@ struct batadv_vis_info_entry { | |||
453 | uint8_t quality; /* quality = 0 client */ | 453 | uint8_t quality; /* quality = 0 client */ |
454 | } __packed; | 454 | } __packed; |
455 | 455 | ||
456 | struct batadv_recvlist_node { | 456 | struct batadv_vis_recvlist_node { |
457 | struct list_head list; | 457 | struct list_head list; |
458 | uint8_t mac[ETH_ALEN]; | 458 | uint8_t mac[ETH_ALEN]; |
459 | }; | 459 | }; |
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c index 3d42b17ede08..2e70ec113205 100644 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c | |||
@@ -36,7 +36,7 @@ static void batadv_free_info(struct kref *ref) | |||
36 | { | 36 | { |
37 | struct batadv_vis_info *info; | 37 | struct batadv_vis_info *info; |
38 | struct batadv_priv *bat_priv; | 38 | struct batadv_priv *bat_priv; |
39 | struct batadv_recvlist_node *entry, *tmp; | 39 | struct batadv_vis_recvlist_node *entry, *tmp; |
40 | 40 | ||
41 | info = container_of(ref, struct batadv_vis_info, refcount); | 41 | info = container_of(ref, struct batadv_vis_info, refcount); |
42 | bat_priv = info->bat_priv; | 42 | bat_priv = info->bat_priv; |
@@ -305,7 +305,7 @@ static void batadv_send_list_del(struct batadv_vis_info *info) | |||
305 | static void batadv_recv_list_add(struct batadv_priv *bat_priv, | 305 | static void batadv_recv_list_add(struct batadv_priv *bat_priv, |
306 | struct list_head *recv_list, const char *mac) | 306 | struct list_head *recv_list, const char *mac) |
307 | { | 307 | { |
308 | struct batadv_recvlist_node *entry; | 308 | struct batadv_vis_recvlist_node *entry; |
309 | 309 | ||
310 | entry = kmalloc(sizeof(*entry), GFP_ATOMIC); | 310 | entry = kmalloc(sizeof(*entry), GFP_ATOMIC); |
311 | if (!entry) | 311 | if (!entry) |
@@ -322,7 +322,7 @@ static int batadv_recv_list_is_in(struct batadv_priv *bat_priv, | |||
322 | const struct list_head *recv_list, | 322 | const struct list_head *recv_list, |
323 | const char *mac) | 323 | const char *mac) |
324 | { | 324 | { |
325 | const struct batadv_recvlist_node *entry; | 325 | const struct batadv_vis_recvlist_node *entry; |
326 | 326 | ||
327 | spin_lock_bh(&bat_priv->vis.list_lock); | 327 | spin_lock_bh(&bat_priv->vis.list_lock); |
328 | list_for_each_entry(entry, recv_list, list) { | 328 | list_for_each_entry(entry, recv_list, list) { |