--- openflow-2011-10-11-3.h	2015-07-23 09:54:16.676479343 -0700
+++ openflow-2011-10-12-3.h	2015-07-23 09:54:16.684479343 -0700
@@ -616,13 +616,13 @@
 /* Fields to match against flows */
 struct ofp_match {
     uint16_t type;             /* One of OFPMT_* */
-    uint16_t length;           /* Length of ofp_match */
+    uint16_t length;           /* Length of ofp_match (excluding padding) */
     /* Followed by:
-     *   - Exactly match_len (possibly 0) bytes containing OXM TLVs, then
+     *   - Exactly (match_len - 4) (possibly 0) bytes containing OXM TLVs, then
      *   - Exactly (match_len + 7)/8*8 - match_len (between 0 and 7) bytes of
      *     all-zero bytes
      */
-    uint8_t fields[4];         /* Make compiler happy */
+    uint8_t oxm_fields[4];     /* OXMs start here - Make compiler happy */
 };
 OFP_ASSERT(sizeof(struct ofp_match) == 8);