--- openflow-2011-09-22.h	2015-07-23 09:54:16.940479354 -0700
+++ openflow-2011-10-10.h	2015-07-23 09:54:16.948479354 -0700
@@ -1268,6 +1268,43 @@
 };
 OFP_ASSERT(sizeof(struct ofp_flow_removed) == 56);
 
+/* Meter numbering. Flow meters can use any number up to OFPM_MAX. */
+enum ofp_meter {
+    /* Last usable meter. */
+    OFPM_MAX        = 0xffff0000,
+
+    /* Virtual meters. */
+    OFPM_SLOWPATH   = 0xfffffffd;  /* Meter for slow datapath. */
+    OFPM_CONTROLLER = 0xfffffffe;  /* Meter for controller datapath. */
+    OFPM_ALL        = 0xffffffff,  /* Represents all meters for stat requests
+                                      commands. */
+};
+
+/* Meter capability flags and configuration flags */
+enum ofp_meter_capabilities {
+    OFPMC_KBPS    = 1 << 0,     /* Rate value in kb/s (kilo-bit per second) */
+    OFPMC_PKTPS   = 1 << 1,     /* Rate value in packet/sec */
+    OFPMC_DROP    = 1 << 2,     /* Drop packet if rate exceeded */
+    OFPMC_ACTIONS = 1 << 3,     /* Write actions if rate exceeded */
+    OFPMC_BURST   = 1 << 4,     /* Do burst size */
+    OFPMC_STATS   = 1 << 5,     /* Collect statistics */
+};
+
+/* Meter configuration. OFPT_METER_SET_REQUEST. */
+struct ofp_meter_set_request {
+    struct ofp_header	header;
+    uint16_t            command;        /* One of OFPGC_*. */
+    uint8_t             pad[2];
+    uint32_t            meter_id;       /* Meter instance. */
+    uint32_t            flags;          /* One of OFPMC_*. */
+    uint32_t            drop_rate;      /* Rate for dropping packets */
+    uint32_t            actions_rate;   /* Rate for writing actions */
+    uint32_t            burst_size;     /* Size of bursts */
+    struct ofp_action_header actions[0]; /* The action length is inferred
+                                           from the length field in the
+                                           header. */
+};
+
 /* Values for 'type' in ofp_error_message.  These values are immutable: they
  * will not change in future versions of the protocol (although new values may
  * be added). */
@@ -2011,41 +2048,4 @@
 };
 OFP_ASSERT(sizeof(struct ofp_async_config) == 32);
 
-/* Meter numbering. Flow meters can use any number up to OFPM_MAX. */
-enum ofp_meter {
-    /* Last usable meter. */
-    OFPM_MAX        = 0xffff0000,
-
-    /* Virtual meters. */
-    OFPM_SLOWPATH   = 0xfffffffd;  /* Meter for slow datapath. */
-    OFPM_CONTROLLER = 0xfffffffe;  /* Meter for controller datapath. */
-    OFPM_ALL        = 0xffffffff,  /* Represents all meters for stat requests
-                                      commands. */
-};
-
-/* Meter capability flags and configuration flags */
-enum ofp_meter_capabilities {
-    OFPMC_KBPS    = 1 << 0,     /* Rate value in kb/s (kilo-bit per second) */
-    OFPMC_PKTPS   = 1 << 1,     /* Rate value in packet/sec */
-    OFPMC_DROP    = 1 << 2,     /* Drop packet if rate exceeded */
-    OFPMC_ACTIONS = 1 << 3,     /* Write actions if rate exceeded */
-    OFPMC_BURST   = 1 << 4,     /* Do burst size */
-    OFPMC_STATS   = 1 << 5,     /* Collect statistics */
-};
-
-/* Meter configuration. OFPT_METER_SET_REQUEST. */
-struct ofp_meter_set_request {
-    struct ofp_header	header;
-    uint16_t            command;        /* One of OFPGC_*. */
-    uint8_t             pad[2];
-    uint32_t            meter_id;       /* Meter instance. */
-    uint32_t            flags;          /* One of OFPMC_*. */
-    uint32_t            drop_rate;      /* Rate for dropping packets */
-    uint32_t            actions_rate;   /* Rate for writing actions */
-    uint32_t            burst_size;     /* Size of bursts */
-    struct ofp_action_header actions[0]; /* The action length is inferred
-                                           from the length field in the
-                                           header. */
-};
-
 #endif /* openflow/openflow.h */