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

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


The following commit has been merged in the master branch:
commit 0035f97e65761099cbfa9554ee8cd9bfc395eeea
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Wed Apr 24 16:37:52 2013 +0200

    batman-adv: move BATADV_TT_CLIENT_TEMP to higher bit
    
    Client flags from bit 0 to 7 are sent over the wire.
    BATADV_TT_CLIENT_TEMP is a local flag and is not supposed
    to be sent to the network. Therefore it has occupy a
    higher bit.
    
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index 7a337d7..ab3084f 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -106,10 +106,10 @@ enum batadv_tt_client_flags {
 	BATADV_TT_CLIENT_DEL     = BIT(0),
 	BATADV_TT_CLIENT_ROAM    = BIT(1),
 	BATADV_TT_CLIENT_WIFI    = BIT(2),
-	BATADV_TT_CLIENT_TEMP	 = BIT(3),
 	BATADV_TT_CLIENT_NOPURGE = BIT(8),
 	BATADV_TT_CLIENT_NEW     = BIT(9),
 	BATADV_TT_CLIENT_PENDING = BIT(10),
+	BATADV_TT_CLIENT_TEMP	 = BIT(11),
 };
 
 /* claim frame types for the bridge loop avoidance */

-- 
LinuxNextTracking


More information about the linux-merge mailing list