--- openflow-2011-01-24-2.h	2015-07-23 09:54:16.484479335 -0700
+++ openflow-2011-01-25.h	2015-07-23 09:54:16.492479335 -0700
@@ -893,7 +893,8 @@
     OFPET_PORT_MOD_FAILED,      /* Port mod request failed. */
     OFPET_TABLE_MOD_FAILED,     /* Table mod request failed. */
     OFPET_QUEUE_OP_FAILED,      /* Queue operation failed. */
-    OFPET_SWITCH_CONFIG_FAILED  /* Switch config request failed. */
+    OFPET_SWITCH_CONFIG_FAILED, /* Switch config request failed. */
+    OFPET_BAD_INSTRUCTION,      /* Error in instruction list. */
 };
 
 /* ofp_error_msg 'code' values for OFPET_HELLO_FAILED.  'data' contains an
@@ -951,8 +952,6 @@
     OFPFMFC_BAD_TIMEOUT,        /* Flow not added because of unsupported
                                    idle/hard timeout. */
     OFPFMFC_BAD_COMMAND,        /* Unsupported or unknown command. */
-    OFPFMFC_BAD_INSTRUCTION,    /* Unsupported instruction specified by the
-                                   flow mod. */
     OFPFMFC_BAD_MATCH,          /* Unsupported match specified by the
                                    flow mod. */
     OFPFMFC_BAD_MATCH_TYPE,     /* Unsupported match type specified by the
@@ -1022,6 +1021,20 @@
     OFPSCFC_BAD_LEN              /* Specified len is invalid. */
 };
 
+/* ofp_error_msg 'code' values for OFPET_BAD_INSTRUCTION.  'data' contains at least
+ * the first 64 bytes of the failed request. */
+enum ofp_bad_instruction_code {
+    OFPBIC_UNKNOWN_INST,       /* Unknown instruction. */
+    OFPBIC_UNSUP_INST,         /* Switch or table does not support the
+                                  instruction. */
+    OFPBIC_BAD_TABLE_ID,       /* Invalid Table-ID specified. */
+    OFPBIC_UNSUP_METADATA,     /* Metadata value unsupported by datapath. */
+    OFPBIC_UNSUP_METADATA_MASK,/* Metadata mask value unsupported by
+                                  datapath. */
+    OFPBIC_UNSUP_EXP_INST,     /* Specific experimenter instruction
+                                  unsupported. */
+};
+
 /* OFPT_ERROR: Error message (datapath -> controller). */
 struct ofp_error_msg {
     struct ofp_header header;