Noticed difference in packet.h in master.diff

postmaster at open-mesh.org postmaster at open-mesh.org
Mon Jun 10 00:15:01 CEST 2013


--- batman-adv_master.packet.h	2013-06-10 00:15:01.411992986 +0200
+++ batctl_master.packet.h	2013-06-10 00:15:01.415993569 +0200
@@ -122,14 +122,6 @@
 	BATADV_TT_CLIENT_TEMP	 = BIT(11),
 };
 
-/**
- * batadv_vlan_flags - flags for the four MSB of any vlan ID field
- * @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not
- */
-enum batadv_vlan_flags {
-	BATADV_VLAN_HAS_TAG	= BIT(15),
-};
-
 /* claim frame types for the bridge loop avoidance */
 enum batadv_bla_claimframe {
 	BATADV_CLAIM_TYPE_CLAIM		= 0x00,
@@ -407,23 +399,21 @@
  *  batadv_tt_client_flags)
  * @reserved: reserved field
  * @addr: mac address of non-mesh client that triggered this tt change
- * @vid: VLAN identifier
  */
 struct batadv_tvlv_tt_change {
 	uint8_t flags;
 	uint8_t reserved;
 	uint8_t addr[ETH_ALEN];
-	__be16 vid;
 };
 
 /**
  * struct batadv_tvlv_roam_adv - roaming advertisement
  * @client: mac address of roaming client
- * @vid: VLAN identifier
+ * @reserved: field reserved for future use
  */
 struct batadv_tvlv_roam_adv {
 	uint8_t  client[ETH_ALEN];
-	__be16 vid;
+	uint16_t reserved;
 };
 
 #endif /* _NET_BATMAN_ADV_PACKET_H_ */


More information about the linux-merge mailing list