--- openflow-2013-01-15.h	2015-07-23 09:54:17.260479367 -0700
+++ openflow-2013-01-15-2.h	2015-07-23 09:54:17.264479367 -0700
@@ -2117,22 +2117,12 @@
     uint16_t         length;  /* Length in bytes of this property. */
     uint8_t          pad[4];  /* Align to 64 bits. */
 
-    uint64_t rx_dropped;     /* Number of packets dropped by RX. */
-    uint64_t tx_dropped;     /* Number of packets dropped by TX. */
-    uint64_t rx_errors;      /* Number of receive errors.  This is a super-set
-                                of more specific receive errors and should be
-                                greater than or equal to the sum of all
-                                rx_*_err values. */
-    uint64_t tx_errors;      /* Number of transmit errors.  This is a super-set
-                                of more specific transmit errors and should be
-                                greater than or equal to the sum of all
-                                tx_*_err values (none currently defined.) */
     uint64_t rx_frame_err;   /* Number of frame alignment errors. */
     uint64_t rx_over_err;    /* Number of packets with RX overrun. */
     uint64_t rx_crc_err;     /* Number of CRC errors. */
     uint64_t collisions;     /* Number of collisions. */
 };
-OFP_ASSERT(sizeof(struct ofp_port_stats_prop_ethernet) == 72);
+OFP_ASSERT(sizeof(struct ofp_port_stats_prop_ethernet) == 40);
 
 /* Experimenter port stats property. */
 struct ofp_port_stats_prop_experimenter {
@@ -2164,10 +2154,21 @@
     uint64_t rx_bytes;       /* Number of received bytes. */
     uint64_t tx_bytes;       /* Number of transmitted bytes. */
 
+    uint64_t rx_dropped;     /* Number of packets dropped by RX. */
+    uint64_t tx_dropped;     /* Number of packets dropped by TX. */
+    uint64_t rx_errors;      /* Number of receive errors.  This is a super-set
+                                of more specific receive errors and should be
+                                greater than or equal to the sum of all
+                                rx_*_err values in properties. */
+    uint64_t tx_errors;      /* Number of transmit errors.  This is a super-set
+                                of more specific transmit errors and should be
+                                greater than or equal to the sum of all
+                                tx_*_err values (none currently defined.) */
+
     /* Port description property list - 0 or more properties */
     struct ofp_port_desc_prop_header properties[0];
 };
-OFP_ASSERT(sizeof(struct ofp_port_stats) == 48);
+OFP_ASSERT(sizeof(struct ofp_port_stats) == 80);
 
 /* Body of OFPMP_GROUP request. */
 struct ofp_group_stats_request {