--- batman-adv_master.packet.h 2015-09-15 00:05:01.606209854 +0200 +++ batctl_master.packet.h 2015-09-15 00:05:01.694215718 +0200 @@ -159,7 +159,7 @@ };

/** - * enum batadv_vlan_flags - flags for the four MSB of any vlan ID field + * 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 { @@ -231,7 +231,7 @@ #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet)

/** - * struct batadv_icmp_header - common members among all the ICMP packets + * batadv_icmp_header - common members among all the ICMP packets * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header * @ttl: time to live for this packet, part of the genereal header @@ -257,7 +257,7 @@ };

/** - * struct batadv_icmp_packet - ICMP packet + * batadv_icmp_packet - ICMP packet * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header * @ttl: time to live for this packet, part of the genereal header @@ -283,7 +283,7 @@ #define BATADV_RR_LEN 16

/** - * struct batadv_icmp_packet_rr - ICMP RouteRecord packet + * batadv_icmp_packet_rr - ICMP RouteRecord packet * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header * @ttl: time to live for this packet, part of the genereal header @@ -414,6 +414,7 @@ * @packet_type: batman-adv packet type, part of the general header * @version: batman-adv protocol version, part of the genereal header * @ttl: time to live for this packet, part of the genereal header + * @reserved: Align following fields to 2-byte boundaries * @first_source: original source of first included packet * @first_orig_dest: original destinal of first included packet * @first_crc: checksum of first included packet @@ -495,7 +496,7 @@ * 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 - * @num_vlan: number of announced VLANs. In the TVLV this struct is followed by + * @vlan_num: number of announced VLANs. In the TVLV this struct is followed by * one batadv_tvlv_tt_vlan_data object per announced vlan */ struct batadv_tvlv_tt_data {