Noticed difference in packet.h in master.diff

postmaster at open-mesh.org postmaster at open-mesh.org
Mon Feb 17 00:15:01 CET 2014


--- batman-adv_master.packet.h	2014-02-17 00:15:01.428722365 +0100
+++ batctl_master.packet.h	2014-02-17 00:15:01.468724829 +0100
@@ -89,19 +89,6 @@
 	BATADV_PARAMETER_PROBLEM       = 12,
 };
 
-/**
- * enum batadv_mcast_flags - flags for multicast capabilities and settings
- * @BATADV_MCAST_WANT_ALL_UNSNOOPABLES: we want all packets destined for
- *  224.0.0.0/24 or ff02::1
- * @BATADV_MCAST_WANT_ALL_IPV4: we want all IPv4 multicast packets
- * @BATADV_MCAST_WANT_ALL_IPV6: we want all IPv6 multicast packets
- */
-enum batadv_mcast_flags {
-	BATADV_MCAST_WANT_ALL_UNSNOOPABLES = BIT(0),
-	BATADV_MCAST_WANT_ALL_IPV4 = BIT(1),
-	BATADV_MCAST_WANT_ALL_IPV6 = BIT(2),
-};
-
 /* tt data subtypes */
 #define BATADV_TT_DATA_TYPE_MASK 0x0F
 
@@ -158,7 +145,6 @@
  * @BATADV_TVLV_NC: network coding tvlv
  * @BATADV_TVLV_TT: translation table tvlv
  * @BATADV_TVLV_ROAM: roaming advertisement tvlv
- * @BATADV_TVLV_MCAST: multicast capability tvlv
  */
 enum batadv_tvlv_type {
 	BATADV_TVLV_GW		= 0x01,
@@ -166,7 +152,6 @@
 	BATADV_TVLV_NC		= 0x03,
 	BATADV_TVLV_TT		= 0x04,
 	BATADV_TVLV_ROAM	= 0x05,
-	BATADV_TVLV_MCAST	= 0x06,
 };
 
 #pragma pack(2)
@@ -519,14 +504,4 @@
 	__be16 vid;
 };
 
-/**
- * struct batadv_tvlv_mcast_data - payload of a multicast tvlv
- * @flags: multicast flags announced by the orig node
- * @reserved: reserved field
- */
-struct batadv_tvlv_mcast_data {
-	uint8_t	flags;
-	uint8_t reserved[3];
-};
-
 #endif /* _NET_BATMAN_ADV_PACKET_H_ */


More information about the linux-merge mailing list