Noticed difference in packet.h in master.diff

postmaster at open-mesh.org postmaster at open-mesh.org
Tue Oct 15 00:15:01 CEST 2013


--- batman-adv_master.packet.h	2013-10-15 00:15:01.360922226 +0200
+++ batctl_master.packet.h	2013-10-15 00:15:01.364922497 +0200
@@ -110,13 +110,12 @@
 
 /* BATADV_TT_CLIENT flags.
  * Flags from BIT(0) to BIT(7) are sent on the wire, while flags from BIT(8) to
- * BIT(15) are used for local computation only.
- * Flags from BIT(4) to BIT(7) are kept in sync with the rest of the network.
+ * BIT(15) are used for local computation only
  */
 enum batadv_tt_client_flags {
 	BATADV_TT_CLIENT_DEL     = BIT(0),
 	BATADV_TT_CLIENT_ROAM    = BIT(1),
-	BATADV_TT_CLIENT_WIFI    = BIT(4),
+	BATADV_TT_CLIENT_WIFI    = BIT(2),
 	BATADV_TT_CLIENT_NOPURGE = BIT(8),
 	BATADV_TT_CLIENT_NEW     = BIT(9),
 	BATADV_TT_CLIENT_PENDING = BIT(10),


More information about the linux-merge mailing list