Noticed difference in packet.h in master.diff

postmaster at open-mesh.org postmaster at open-mesh.org
Wed Nov 18 00:05:01 CET 2015


--- batman-adv_master.packet.h	2015-11-18 00:05:01.842924641 +0100
+++ batctl_master.packet.h	2015-11-18 00:05:01.846924907 +0100
@@ -209,11 +209,6 @@
  * @version: batman-adv protocol version, part of the genereal header
  * @ttl: time to live for this packet, part of the genereal header
  * @flags: contains routing relevant flags - see enum batadv_iv_flags
- * @seqno: sequence identification
- * @orig: address of the source node
- * @prev_sender: address of the previous sender
- * @reserved: reserved byte for alignment
- * @tq: transmission quality
  * @tvlv_len: length of tvlv data following the ogm header
  */
 struct batadv_ogm_packet {
@@ -350,7 +345,6 @@
  * @u: common unicast packet header
  * @src: address of the source
  * @subtype: packet subtype
- * @reserved: reserved byte for alignment
  */
 struct batadv_unicast_4addr_packet {
 	struct batadv_unicast_packet u;


More information about the linux-merge mailing list