--- openflow-2013-08-08.h	2015-07-23 09:54:17.544479378 -0700
+++ openflow-2013-06-24-2.h	2015-07-23 09:54:17.548479378 -0700
@@ -185,14 +185,16 @@
 /* Common header for all Hello Elements */
 struct ofp_hello_elem_header {
     uint16_t         type;    /* One of OFPHET_*. */
-    uint16_t         length;  /* Length in bytes of this element. */
+    uint16_t         length;  /* Length in bytes of the element,
+                                 including this header, excluding padding. */
 };
 OFP_ASSERT(sizeof(struct ofp_hello_elem_header) == 4);
 
 /* Version bitmap Hello Element */
 struct ofp_hello_elem_versionbitmap {
     uint16_t         type;    /* OFPHET_VERSIONBITMAP. */
-    uint16_t         length;  /* Length in bytes of this element. */
+    uint16_t         length;  /* Length in bytes of this element,
+                                 including this header, excluding padding. */
     /* Followed by:
      *   - Exactly (length - 4) bytes containing the bitmaps, then
      *   - Exactly (length + 7)/8*8 - (length) (between 0 and 7)
@@ -1244,8 +1246,8 @@
     uint16_t type;                  /* OFPAT_SET_FIELD. */
     uint16_t len;                   /* Length is padded to 64 bits. */
     /* Followed by:
-     *   - Exactly oxm_len bytes containing a single OXM TLV, then
-     *   - Exactly ((oxm_len + 4) + 7)/8*8 - (oxm_len + 4) (between 0 and 7)
+     *   - Exactly (len - 4) bytes containing a single OXM TLV, then
+     *   - Exactly (len + 7)/8*8 - len (between 0 and 7)
      *     bytes of all-zero bytes
      */
     uint8_t field[4];               /* OXM TLV - Make compiler happy */