Noticed difference in packet.h in master.diff

postmaster at open-mesh.org postmaster at open-mesh.org
Tue Feb 7 00:15:01 CET 2012


--- batman-adv_master.packet.h	2012-02-07 00:15:01.236774398 +0100
+++ batctl_master.packet.h	2012-02-07 00:15:01.240774279 +0100
@@ -90,22 +90,6 @@
 	TT_CLIENT_PENDING = 1 << 10
 };
 
-/* claim frame types for the bridge loop avoidance */
-enum bla_claimframe {
-	CLAIM_TYPE_ADD		= 0x00,
-	CLAIM_TYPE_DEL		= 0x01,
-	CLAIM_TYPE_ANNOUNCE	= 0x02,
-	CLAIM_TYPE_REQUEST	= 0x03
-};
-
-/* the destination hardware field in the ARP frame is used to
- * transport the claim type and the group id */
-struct bla_claim_dst {
-	uint8_t magic[3];	/* FF:43:05 */
-	uint8_t type;		/* bla_claimframe */
-	uint16_t group;		/* group id */
-} __packed;
-
 struct batman_header {
 	uint8_t  packet_type;
 	uint8_t  version;  /* batman version field */


More information about the linux-merge mailing list