--- openflow-2011-10-13-2.h	2015-07-23 09:54:16.724479345 -0700
+++ openflow-2011-10-13-3.h	2015-07-23 09:54:16.728479345 -0700
@@ -409,43 +409,43 @@
 /* OXM Flow match field types for OpenFlow basic class. */
 enum oxm_ofb_match_fields {
     OFPXMT_OFB_IN_PORT        = 0,  /* Switch input port. */
-    OFPXMT_OFB_IN_PHY_PORT    = 34,  /* Switch physical input port. */
-    OFPXMT_OFB_METADATA       = 1,  /* Metadata passed between tables. */
-    OFPXMT_OFB_ETH_DST        = 2,  /* Ethernet destination address. */
-    OFPXMT_OFB_ETH_SRC        = 3,  /* Ethernet source address. */
-    OFPXMT_OFB_ETH_TYPE       = 4,  /* Ethernet frame type. */
-    OFPXMT_OFB_VLAN_VID       = 5,  /* VLAN id. */
-    OFPXMT_OFB_VLAN_PCP       = 6,  /* VLAN priority. */
-    OFPXMT_OFB_IP_TOS         = 7,  /* IP ToS (DSCP field, 6 bits). */
-    OFPXMT_OFB_IP_ECN         = 8,  /* IP ECN bits (2 bits). */
-    OFPXMT_OFB_IP_PROTO       = 9,  /* IP protocol. */
-    OFPXMT_OFB_IPV4_SRC       = 10, /* IPv4 source address. */
-    OFPXMT_OFB_IPV4_DST       = 11, /* IPv4 destination address. */
-    OFPXMT_OFB_TCP_SRC        = 12, /* TCP source port. */
-    OFPXMT_OFB_TCP_DST        = 13, /* TCP destination port. */
-    OFPXMT_OFB_UDP_SRC        = 14, /* UDP source port. */
-    OFPXMT_OFB_UDP_DST        = 15, /* UDP destination port. */
-    OFPXMT_OFB_SCTP_SRC       = 16, /* SCTP source port. */
-    OFPXMT_OFB_SCTP_DST       = 17, /* SCTP destination port. */
-    OFPXMT_OFB_ICMPV4_TYPE    = 18, /* ICMP type. */
-    OFPXMT_OFB_ICMPV4_CODE    = 19, /* ICMP code. */
-    OFPXMT_OFB_ARP_OP         = 20, /* ARP opcode. */
-    OFPXMT_OFB_ARP_SPA        = 21, /* ARP source IPv4 address. */
-    OFPXMT_OFB_ARP_TPA        = 22, /* ARP target IPv4 address. */
-    OFPXMT_OFB_ARP_SHA        = 23, /* ARP source hardware address. */
-    OFPXMT_OFB_ARP_THA        = 24, /* ARP target hardware address. */
-    OFPXMT_OFB_IPV6_SRC       = 25, /* IPv6 source address. */
-    OFPXMT_OFB_IPV6_DST       = 26, /* IPv6 destination address. */
-    OFPXMT_OFB_ICMPV6_TYPE    = 27, /* ICMP type. */
-    OFPXMT_OFB_ICMPV6_CODE    = 28, /* ICMP code. */
-    OFPXMT_OFB_IPV6_ND_TARGET = 29, /* Target address for ND. */
-    OFPXMT_OFB_IPV6_ND_SLL    = 30, /* Source link-layer for ND. */
-    OFPXMT_OFB_IPV6_ND_TLL    = 31, /* Target link-layer for ND. */
-    OFPXMT_OFB_MPLS_LABEL     = 32, /* MPLS label. */
-    OFPXMT_OFB_MPLS_TC        = 33, /* MPLS TC. */
+    OFPXMT_OFB_IN_PHY_PORT    = 1,  /* Switch physical input port. */
+    OFPXMT_OFB_METADATA       = 2,  /* Metadata passed between tables. */
+    OFPXMT_OFB_ETH_DST        = 3,  /* Ethernet destination address. */
+    OFPXMT_OFB_ETH_SRC        = 4,  /* Ethernet source address. */
+    OFPXMT_OFB_ETH_TYPE       = 5,  /* Ethernet frame type. */
+    OFPXMT_OFB_VLAN_VID       = 6,  /* VLAN id. */
+    OFPXMT_OFB_VLAN_PCP       = 7,  /* VLAN priority. */
+    OFPXMT_OFB_IP_TOS         = 8,  /* IP ToS (DSCP field, 6 bits). */
+    OFPXMT_OFB_IP_ECN         = 9,  /* IP ECN bits (2 bits). */
+    OFPXMT_OFB_IP_PROTO       = 10, /* IP protocol. */
+    OFPXMT_OFB_IPV4_SRC       = 11, /* IPv4 source address. */
+    OFPXMT_OFB_IPV4_DST       = 12, /* IPv4 destination address. */
+    OFPXMT_OFB_TCP_SRC        = 13, /* TCP source port. */
+    OFPXMT_OFB_TCP_DST        = 14, /* TCP destination port. */
+    OFPXMT_OFB_UDP_SRC        = 15, /* UDP source port. */
+    OFPXMT_OFB_UDP_DST        = 16, /* UDP destination port. */
+    OFPXMT_OFB_SCTP_SRC       = 17, /* SCTP source port. */
+    OFPXMT_OFB_SCTP_DST       = 18, /* SCTP destination port. */
+    OFPXMT_OFB_ICMPV4_TYPE    = 19, /* ICMP type. */
+    OFPXMT_OFB_ICMPV4_CODE    = 20, /* ICMP code. */
+    OFPXMT_OFB_ARP_OP         = 21, /* ARP opcode. */
+    OFPXMT_OFB_ARP_SPA        = 22, /* ARP source IPv4 address. */
+    OFPXMT_OFB_ARP_TPA        = 23, /* ARP target IPv4 address. */
+    OFPXMT_OFB_ARP_SHA        = 24, /* ARP source hardware address. */
+    OFPXMT_OFB_ARP_THA        = 25, /* ARP target hardware address. */
+    OFPXMT_OFB_IPV6_SRC       = 26, /* IPv6 source address. */
+    OFPXMT_OFB_IPV6_DST       = 27, /* IPv6 destination address. */
+    OFPXMT_OFB_ICMPV6_TYPE    = 29, /* ICMP type. */
+    OFPXMT_OFB_ICMPV6_CODE    = 30, /* ICMP code. */
+    OFPXMT_OFB_IPV6_ND_TARGET = 31, /* Target address for ND. */
+    OFPXMT_OFB_IPV6_ND_SLL    = 32, /* Source link-layer for ND. */
+    OFPXMT_OFB_IPV6_ND_TLL    = 33, /* Target link-layer for ND. */
+    OFPXMT_OFB_MPLS_LABEL     = 34, /* MPLS label. */
+    OFPXMT_OFB_MPLS_TC        = 35, /* MPLS TC. */
 };
 
-#define OFPXMT_OFB_ALL    ((UINT64_C(1) << 35) - 1)
+#define OFPXMT_OFB_ALL    ((UINT64_C(1) << 36) - 1)
 
 /* Physical or virtual port on which the packet was received.
  *