[linux-next] LinuxNextTracking branch, master, updated. next-20130121

batman at open-mesh.org batman at open-mesh.org
Tue Jan 22 00:19:57 CET 2013


The following commit has been merged in the master branch:
commit 28500f07abf120e5609a68d6eb2f78350562381d
Author: Marek Lindner <lindner_marek at yahoo.de>
Date:   Tue Dec 25 17:03:23 2012 +0800

    batman-adv: rename batadv_recvlist_node struct to make clear it is used by vis
    
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index d17517c..c56e0d9 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -453,7 +453,7 @@ struct batadv_vis_info_entry {
 	uint8_t  quality;	/* quality = 0 client */
 } __packed;
 
-struct batadv_recvlist_node {
+struct batadv_vis_recvlist_node {
 	struct list_head list;
 	uint8_t mac[ETH_ALEN];
 };
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index 3d42b17..2e70ec1 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)
 {
 	struct batadv_vis_info *info;
 	struct batadv_priv *bat_priv;
-	struct batadv_recvlist_node *entry, *tmp;
+	struct batadv_vis_recvlist_node *entry, *tmp;
 
 	info = container_of(ref, struct batadv_vis_info, refcount);
 	bat_priv = info->bat_priv;
@@ -305,7 +305,7 @@ static void batadv_send_list_del(struct batadv_vis_info *info)
 static void batadv_recv_list_add(struct batadv_priv *bat_priv,
 				 struct list_head *recv_list, const char *mac)
 {
-	struct batadv_recvlist_node *entry;
+	struct batadv_vis_recvlist_node *entry;
 
 	entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
 	if (!entry)
@@ -322,7 +322,7 @@ static int batadv_recv_list_is_in(struct batadv_priv *bat_priv,
 				  const struct list_head *recv_list,
 				  const char *mac)
 {
-	const struct batadv_recvlist_node *entry;
+	const struct batadv_vis_recvlist_node *entry;
 
 	spin_lock_bh(&bat_priv->vis.list_lock);
 	list_for_each_entry(entry, recv_list, list) {

-- 
LinuxNextTracking


More information about the linux-merge mailing list