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

batman at open-mesh.org batman at open-mesh.org
Fri Jul 20 00:16:46 CEST 2018


The following commit has been merged in the master branch:
commit 993a4a5f7cd3aef53be3953d11f86b2d3630ebb8
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Jul 7 21:50:18 2018 +0200

    batman-adv: Convert batadv_dat_addr_t to proper type
    
    The #define for batadv_dat_addr_t is doing nothing else than giving u16 a
    new typename. But C already has the special keyword "typedef" which is also
    better supported by kernel-doc.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Acked-by: Antonio Quartulli <a at unstable.cc>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 360357f83f20..343d304851a5 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -43,12 +43,13 @@ struct seq_file;
 #ifdef CONFIG_BATMAN_ADV_DAT
 
 /**
- * batadv_dat_addr_t - it is the type used for all DHT addresses. If it is
- *  changed, BATADV_DAT_ADDR_MAX is changed as well.
+ * typedef batadv_dat_addr_t - type used for all DHT addresses
+ *
+ * If it is changed, BATADV_DAT_ADDR_MAX is changed as well.
  *
  * *Please be careful: batadv_dat_addr_t must be UNSIGNED*
  */
-#define batadv_dat_addr_t u16
+typedef u16 batadv_dat_addr_t;
 
 #endif /* CONFIG_BATMAN_ADV_DAT */
 

-- 
LinuxNextTracking


More information about the linux-merge mailing list