--- openflow-2011-09-19-4.h	2015-07-23 09:54:16.644479341 -0700
+++ openflow-2011-09-30-2.h	2015-07-23 09:54:16.652479342 -0700
@@ -750,7 +750,8 @@
  *
  * Prereqs: None.
  *
- * Format: 16-bit integer in network byte order.
+ * Format: 16-bit integer in network byte order with 4 most-significant
+ * bits forced to 0. Only the lower 12 bits have meaning.
  *
  * Masking: Arbitrary masks.
  *
@@ -779,7 +780,8 @@
  *
  * Prereqs: OXM_OF_VLAN_VID must be different from OFPVID_NONE.
  *
- * Format: 8-bit integer in network byte order.
+ * Format: 8-bit integer with 5 most-significant bits forced to 0.
+ * Only the lower 3 bits have meaning.
  *
  * Masking: Not maskable.
  */
@@ -790,6 +792,7 @@
  * Prereqs: OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd.
  *
  * Format: 8-bit integer with 2 least-significant bits forced to 0.
+ * Only the higher 6 bits have meaning.
  *
  * Masking: Not maskable. */
 #define OXM_OF_IP_TOS     OXM_HEADER  (0x0000, OFPXMT_OF_IP_TOS, 1)
@@ -799,6 +802,7 @@
  * Prereqs: OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd.
  *
  * Format: 8-bit integer with 6 most-significant bits forced to 0.
+ * Only the lower 2 bits have meaning.
  *
  * Masking: Not maskable. */
 #define OXM_OF_IP_ECN     OXM_HEADER  (0x0000, OFPXMT_OF_IP_ECN, 1)
@@ -973,15 +977,26 @@
  * Masking: Not maskable. */
 #define OXM_OF_IPV6_ND_TLL  OXM_HEADER  (0x0000, OFPXMT_OF_IPV6_ND_TLL, 6)
 
-/* The LABEL and TC in the first MPLS shim header.
+/* The LABEL in the first MPLS shim header.
  *
  * Prereqs:
  *   OXM_OF_ETH_TYPE must match 0x8847 or 0x8848 exactly.
  *
- * Format: 32-bit and 8-bit integer.
+ * Format: 32-bit integer in network byte order with 12 most-significant
+ * bits forced to 0. Only the lower 20 bits have meaning.
  *
  * Masking: Not maskable. */
 #define OXM_OF_MPLS_LABEL  OXM_HEADER  (0x0000, OFPXMT_OF_MPLS_LABEL, 4)
+
+/* The TC in the first MPLS shim header.
+ *
+ * Prereqs:
+ *   OXM_OF_ETH_TYPE must match 0x8847 or 0x8848 exactly.
+ *
+ * Format: 8-bit integer with 5 most-significant bits forced to 0.
+ * Only the lower 3 bits have meaning.
+ *
+ * Masking: Not maskable. */
 #define OXM_OF_MPLS_TC     OXM_HEADER  (0x0000, OFPXMT_OF_MPLS_TC, 1)
 
 /* ## ------------- ## */