Noticed difference in packet.h in master.diff

postmaster at open-mesh.org postmaster at open-mesh.org
Fri Jan 2 00:15:02 CET 2015


--- batman-adv_master.packet.h	2015-01-02 00:15:02.067238524 +0100
+++ batctl_master.packet.h	2015-01-02 00:15:02.107241185 +0100
@@ -377,7 +377,7 @@
 	uint8_t reserved:4;
 	uint8_t no:4;
 #else
-#error "unknown bitfield endianness"
+#error "unknown bitfield endianess"
 #endif
 	uint8_t dest[ETH_ALEN];
 	uint8_t orig[ETH_ALEN];
@@ -453,7 +453,7 @@
  * @src: address of the source
  * @dst: address of the destination
  * @tvlv_len: length of tvlv data following the unicast tvlv header
- * @align: 2 bytes to align the header to a 4 byte boundary
+ * @align: 2 bytes to align the header to a 4 byte boundry
  */
 struct batadv_unicast_tvlv_packet {
 	uint8_t  packet_type;


More information about the linux-merge mailing list