--- openflow-2011-11-11.h	2015-07-23 09:54:16.804479348 -0700
+++ openflow-2011-11-07.h	2015-07-23 09:54:16.808479348 -0700
@@ -423,8 +423,8 @@
     OFPXMT_OFB_ETH_TYPE       = 5,  /* Ethernet frame type. */
     OFPXMT_OFB_VLAN_VID       = 6,  /* VLAN id. */
     OFPXMT_OFB_VLAN_PCP       = 7,  /* VLAN priority. */
-    OFPXMT_OFB_IP_TOS         = 8,  /* IP ToS (DSCP field, 6 bits). */
-    OFPXMT_OFB_IP_ECN         = 9,  /* IP ECN bits (2 bits). */
+    OFPXMT_OFB_IP_DSCP        = 8,  /* IP DSCP (6 bits in ToS field). */
+    OFPXMT_OFB_IP_ECN         = 9,  /* IP ECN (2 bits in ToS field). */
     OFPXMT_OFB_IP_PROTO       = 10, /* IP protocol. */
     OFPXMT_OFB_IPV4_SRC       = 11, /* IPv4 source address. */
     OFPXMT_OFB_IPV4_DST       = 12, /* IPv4 destination address. */
@@ -581,9 +581,9 @@
  */
 #define OXM_OF_VLAN_PCP   OXM_HEADER  (0x8000, OFPXMT_OFB_VLAN_PCP, 1)
 
-/* The "type of service" byte of the IP header, with the ECN bits forced to 0.
- * This is actually the DSCP value part of the IPv4 ToS field or the
- * IPv6 Traffic Class field.
+/* The Diff Serv Code Point (DSCP) bits of the IP header, with the ECN bits
+ * forced to 0.
+ * Part of the IPv4 ToS field or the IPv6 Traffic Class field.
  *
  * Prereqs: OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd.
  *
@@ -591,7 +591,7 @@
  * Only the higher 6 bits have meaning.
  *
  * Masking: Not maskable. */
-#define OXM_OF_IP_TOS     OXM_HEADER  (0x8000, OFPXMT_OFB_IP_TOS, 1)
+#define OXM_OF_IP_DSCP     OXM_HEADER  (0x8000, OFPXMT_OFB_IP_DSCP, 1)
 
 /* The ECN bits of the IP header.
  * Part of the IPv4 ToS field or the IPv6 Traffic Class field.