--- openflow-2013-11-30.h	2015-07-23 09:54:17.972479396 -0700
+++ openflow-2014-01-06-2.h	2015-07-23 09:54:17.980479396 -0700
@@ -1983,7 +1983,6 @@
     OFPET_ASYNC_CONFIG_FAILED  = 15, /* Asynchronous config request failed. */
     OFPET_FLOW_MONITOR_FAILED  = 16, /* Setting flow monitor failed. */
     OFPET_BUNDLE_FAILED        = 17, /* Bundle operation failed. */
-    OFPET_SEND_PACKET_FAILED   = 18, /* Send packet failed. */
     OFPET_EXPERIMENTER = 0xffff      /* Experimenter error messages. */
 };
 
@@ -2012,7 +2011,7 @@
     OFPBRC_BAD_TABLE_ID     = 9,  /* Specified table-id invalid or does not
                                    * exist. */
     OFPBRC_IS_SLAVE         = 10, /* Denied because controller is slave. */
-    OFPBRC_BAD_PORT         = 11, /* Invalid port. */
+    OFPBRC_BAD_PORT         = 11, /* Invalid port or missing port. */
     OFPBRC_BAD_PACKET       = 12, /* Invalid packet in packet-out. */
     OFPBRC_MULTIPART_BUFFER_OVERFLOW    = 13, /* ofp_multipart_request
                                      overflowed the assigned buffer. */
@@ -2020,6 +2019,8 @@
     OFPBRC_MULTIPART_REPLY_TIMEOUT = 15, /* Timeout during multipart reply. */
     OFPBRC_MULTIPART_BAD_SCHED = 16, /* Switch received a OFPMP_BUNDLE_FEATURES request and failed 
                                       * to update the scheduling tolerance. */
+    OFPBRC_PIPELINE_FIELDS_ONLY = 17, /* Match fields must include only pipeline fields */
+    OFPBRC_UNKNOWN          = 18, /* Unspecified error. */
 };
 
 /* ofp_error_msg 'code' values for OFPET_BAD_ACTION.  'data' contains at least
@@ -2284,15 +2285,6 @@
   OFPBFC_SCHED_PAST = 18,          /* Scheduled commit time exceeds lower bound. */
 };
 
-/* ofp_error_msg 'code' values for OFPET_SEND_PACKET_FAILED.  'data' contains
- * at least the first 64 bytes of the failed request. */
-enum ofp_packetout_failed_code {
-  OFPBFC_UNKNOWN                = 0, /* Unspecified error. */
-  OFPPFC_BAD_TABLE_ID           = 1, /* Specified table doesn't exist in the pipeline */
-  OFPPFC_PIPELINE_FIELDS_ONLY   = 2, /* Match fields must include only pipeline fields */
-  OFPPFC_PORT_FIELD_MISSING     = 3, /* Match fields doesn't include In Port fields  */
-};
-
 /* OFPT_ERROR: Error message (datapath -> controller). */
 struct ofp_error_msg {
     struct ofp_header header;