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

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:09:46 CEST 2011


The following commit has been merged in the master branch:
commit 402196724816875d382099bedb09fdf1f57845bc
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Wed May 18 16:47:23 2011 +0200

    batman-adv: a multiline comment should precede the variable it is describing
    
    This comment has been wrongly put after the variable it refers to and was also bad indented
    
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Acked-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index fab70e8..65b3222 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -246,10 +246,10 @@ struct frag_packet_list_entry {
 };
 
 struct vis_info {
-	unsigned long       first_seen;
-	struct list_head    recv_list;
-			    /* list of server-neighbors we received a vis-packet
-			     * from.  we should not reply to them. */
+	unsigned long first_seen;
+	/* list of server-neighbors we received a vis-packet
+	 * from.  we should not reply to them. */
+	struct list_head recv_list;
 	struct list_head send_list;
 	struct kref refcount;
 	struct hlist_node hash_entry;

-- 
LinuxNextTracking


More information about the linux-merge mailing list