--- openflow-2011-09-16.h	2015-07-23 09:54:16.628479341 -0700
+++ openflow-2011-09-19.h	2015-07-23 09:54:16.632479341 -0700
@@ -786,7 +786,7 @@
  *
  * Masking: Not maskable.
  */
-#define OXM_OF_VLAN_PCP   OXM_HEADER  (0x0000, OFPXMT_OF_VLAN_PCP, 2)
+#define OXM_OF_VLAN_PCP   OXM_HEADER  (0x0000, OFPXMT_OF_VLAN_PCP, 1)
 
 /* The "type of service" byte of the IP header, with the ECN bits forced to 0.
  *
@@ -879,8 +879,7 @@
 /* ARP opcode.
  *
  * For an Ethernet+IP ARP packet, the opcode in the ARP header.  Always 0
- * otherwise.  Only ARP opcodes between 1 and 255 should be specified for
- * matching.
+ * otherwise.
  *
  * Prereqs: OXM_OF_ETH_TYPE must match 0x0806 exactly.
  *
@@ -1277,7 +1276,7 @@
                                    not support arbitrary network address
                                    mask. */
     OFPBMC_BAD_WILDCARDS,       /* Unsupported combination of fields masked
-				   or ommited in the match. */
+				   or omitted in the match. */
     OFPBMC_BAD_FIELD,		/* Unsupported field type in the match. */
     OFPBMC_BAD_VALUE,		/* Unsupported value in a match field. */
     OFPBMC_BAD_MASK,            /* Unsupported mask specified in the match,