--- openflow-2011-10-28-2.h	2015-07-23 09:54:16.796479348 -0700
+++ openflow-2011-10-31.h	2015-07-23 09:54:16.800479348 -0700
@@ -444,8 +444,8 @@
     OFPXMT_OFB_IPV6_SRC       = 26, /* IPv6 source address. */
     OFPXMT_OFB_IPV6_DST       = 27, /* IPv6 destination address. */
     OFPXMT_OFB_IPV6_FLABEL    = 28, /* IPv6 Flow Label */
-    OFPXMT_OFB_ICMPV6_TYPE    = 29, /* ICMP type. */
-    OFPXMT_OFB_ICMPV6_CODE    = 30, /* ICMP code. */
+    OFPXMT_OFB_ICMPV6_TYPE    = 29, /* ICMPv6 type. */
+    OFPXMT_OFB_ICMPV6_CODE    = 30, /* ICMPv6 code. */
     OFPXMT_OFB_IPV6_ND_TARGET = 31, /* Target address for ND. */
     OFPXMT_OFB_IPV6_ND_SLL    = 32, /* Source link-layer for ND. */
     OFPXMT_OFB_IPV6_ND_TLL    = 33, /* Target link-layer for ND. */
@@ -847,7 +847,7 @@
     OFPAT_GROUP,            /* Apply group. */
     OFPAT_SET_NW_TTL,       /* IP TTL. */
     OFPAT_DEC_NW_TTL,       /* Decrement IP TTL. */
-    OFPAT_SET_FIELD,        /* Set a match field using OXM TLV format. */
+    OFPAT_SET_FIELD,        /* Set a header field using OXM TLV format. */
     OFPAT_EXPERIMENTER = 0xffff
 };
 
@@ -924,8 +924,8 @@
     uint16_t len;                   /* Length is padded to 64 bits. */
     /* Followed by:
      *   - Exactly oxm_len bytes containing a single OXM TLV, then
-     *   - Exactly (oxm_len + 7)/8*8 - oxm_len (between 0 and 7) bytes of
-     *     all-zero bytes
+     *   - Exactly ((oxm_len + 4) + 7)/8*8 - (oxm_len + 4) (between 0 and 7)
+     *     bytes of all-zero bytes
      */
     uint8_t field[4];               /* OXM TLV - Make compiler happy */
 };