Noticed difference in packet.h in master.diff

postmaster at open-mesh.org postmaster at open-mesh.org
Thu Aug 8 00:15:01 CEST 2013


--- batman-adv_master.packet.h	2013-08-08 00:15:01.835350435 +0200
+++ batctl_master.packet.h	2013-08-08 00:15:01.839350666 +0200
@@ -391,26 +391,14 @@
  * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container
  * @flags: translation table flags (see batadv_tt_data_flags)
  * @ttvn: translation table version number
- * @vlan_num: number of announced VLANs. In the TVLV this struct is followed by
- *  one batadv_tvlv_tt_vlan_data object per announced vlan
+ * @reserved: field reserved for future use
+ * @crc: crc32 checksum of the local translation table
  */
 struct batadv_tvlv_tt_data {
 	uint8_t flags;
 	uint8_t ttvn;
-	__be16  num_vlan;
-};
-
-/**
- * struct batadv_tvlv_tt_vlan_data - vlan specific tt data propagated through
- *  the tt tvlv container
- * @crc: crc32 checksum of the entries belonging to this vlan
- * @vid: vlan identifier
- * @reserved: unused, useful for alignment purposes
- */
-struct batadv_tvlv_tt_vlan_data {
-	__be32	crc;
-	__be16	vid;
 	uint16_t reserved;
+	__be32  crc;
 };
 
 /**


More information about the linux-merge mailing list