--- openflow-2011-11-17-2.h	2015-07-23 09:54:16.840479349 -0700
+++ openflow-2011-11-15-3.h	2015-07-23 09:54:16.844479350 -0700
@@ -78,7 +78,7 @@
 
 /* Port numbering. Ports are numbered starting from 1. */
 enum ofp_port_no {
-    /* Maximum number of physical switch ports. */
+    /* Maximum number of physical and logical switch ports. */
     OFPP_MAX        = 0xffffff00,
 
     /* Reserved OpenFlow Port (fake output "ports"). */
@@ -929,7 +929,7 @@
      */
     uint8_t field[4];               /* OXM TLV - Make compiler happy */
 };
-OFP_ASSERT(sizeof(struct ofp_action_nw_ttl) == 8);
+OFP_ASSERT(sizeof(struct ofp_action_set_field) == 8);
 
 /* Action header for OFPAT_EXPERIMENTER.
  * The rest of the body is experimenter-defined. */
@@ -1282,7 +1282,7 @@
     OFPBAC_MATCH_INCONSISTENT, /* Action can't apply for this match,
                                   or Set-Field missing prerequisite. */
     OFPBAC_UNSUPPORTED_ORDER,  /* Action order is unsupported for the action
-				  list in an Apply-Actions instruction */
+                                  list in an Apply-Actions instruction */
     OFPBAC_BAD_TAG,            /* Actions uses an unsupported
                                   tag/encap. */
     OFPBAC_BAD_SET_TYPE,       /* Unsupported type in OFPAT_SET_FIELD action. */
@@ -1320,9 +1320,9 @@
                                    not support arbitrary network address
                                    mask. */
     OFPBMC_BAD_WILDCARDS,       /* Unsupported combination of fields masked
-				   or omitted in the match. */
-    OFPBMC_BAD_FIELD,		/* Unsupported field type in the match. */
-    OFPBMC_BAD_VALUE,		/* Unsupported value in a match field. */
+                                   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,
                                    field is not dl-address or nw-address. */
     OFPBMC_BAD_PREREQ,          /* A prerequisite was not met. */
@@ -1534,7 +1534,7 @@
 struct ofp_flow_stats_request {
     uint8_t table_id;         /* ID of table to read (from ofp_table_stats),
                                  OFPTT_ALL for all tables. */
-    uint8_t pad[3];           /* Align to 64 bits. */
+    uint8_t pad[3];           /* Align to 32 bits. */
     uint32_t out_port;        /* Require matching entries to include this
                                  as an output port.  A value of OFPP_ANY
                                  indicates no restriction. */
@@ -1559,8 +1559,7 @@
     uint32_t duration_sec;    /* Time flow has been alive in seconds. */
     uint32_t duration_nsec;   /* Time flow has been alive in nanoseconds beyond
                                  duration_sec. */
-    uint16_t priority;        /* Priority of the entry. Only meaningful
-                                 when this is not an exact-match entry. */
+    uint16_t priority;        /* Priority of the entry. */
     uint16_t idle_timeout;    /* Number of seconds idle before expiration. */
     uint16_t hard_timeout;    /* Number of seconds before expiration. */
     uint8_t pad2[6];          /* Align to 64-bits. */
@@ -1576,7 +1575,7 @@
 struct ofp_aggregate_stats_request {
     uint8_t table_id;         /* ID of table to read (from ofp_table_stats)
                                  OFPTT_ALL for all tables. */
-    uint8_t pad[3];           /* Align to 64 bits. */
+    uint8_t pad[3];           /* Align to 32 bits. */
     uint32_t out_port;        /* Require matching entries to include this
                                  as an output port.  A value of OFPP_ANY
                                  indicates no restriction. */
@@ -1705,7 +1704,7 @@
 };
 OFP_ASSERT(sizeof(struct ofp_group_desc_stats) == 8);
 
-/* Meter configuration flags */
+/* Group configuration flags */
 enum ofp_group_capabilities {
     OFPGFC_SELECT_WEIGHT   = 1 << 0,  /* Support weight for select groups */
     OFPGFC_SELECT_LIVENESS = 1 << 1,  /* Support liveness for select groups */