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

batman at open-mesh.org batman at open-mesh.org
Wed Oct 30 00:17:58 CET 2013


The following commit has been merged in the master branch:
commit 60cf7981b770e329a05734d1e6eb055f13219202
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Sat Apr 20 15:59:13 2013 +0200

    batman-adv: switch to a new packet compatibility version
    
    With this change batman-adv is breaking compatibility with
    older versions and it is moving to compat-version 15.
    
    Signed-off-by: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Martin Hundebøll <martin at hundeboll.net>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>

diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index a51ccfc..11a22c8 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -48,7 +48,7 @@ enum batadv_subtype {
 };
 
 /* this file is included by batctl which needs these defines */
-#define BATADV_COMPAT_VERSION 14
+#define BATADV_COMPAT_VERSION 15
 
 enum batadv_iv_flags {
 	BATADV_NOT_BEST_NEXT_HOP   = BIT(3),

-- 
LinuxNextTracking


More information about the linux-merge mailing list