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

batman at open-mesh.org batman at open-mesh.org
Tue Jan 14 00:19:32 CET 2014


The following commit has been merged in the master branch:
commit a48bcacdb3b31816500d5732111241b705c4bc61
Author: Antonio Quartulli <antonio at meshcoding.com>
Date:   Sun Oct 13 23:02:45 2013 +0200

    batman-adv: properly rename define in distributed arp table header file
    
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>

diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h
index 60d853b..79a078b 100644
--- a/net/batman-adv/distributed-arp-table.h
+++ b/net/batman-adv/distributed-arp-table.h
@@ -17,8 +17,8 @@
  * 02110-1301, USA
  */
 
-#ifndef _NET_BATMAN_ADV_ARP_H_
-#define _NET_BATMAN_ADV_ARP_H_
+#ifndef _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_
+#define _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_
 
 #ifdef CONFIG_BATMAN_ADV_DAT
 
@@ -169,4 +169,4 @@ static inline void batadv_dat_inc_counter(struct batadv_priv *bat_priv,
 
 #endif /* CONFIG_BATMAN_ADV_DAT */
 
-#endif /* _NET_BATMAN_ADV_ARP_H_ */
+#endif /* _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ */

-- 
LinuxNextTracking


More information about the linux-merge mailing list