--- openflow-2012-03-19.h	2015-07-23 09:54:17.064479359 -0700
+++ openflow-2012-03-22.h	2015-07-23 09:54:17.068479359 -0700
@@ -864,7 +864,7 @@
  *
  * Masking: Maskable. */
 #define OXM_OF_IPV6_EXTHDR   OXM_HEADER  (0x8000, OFPXMT_OFB_IPV6_EXTHDR, 2)
-#define OXM_OF_IPV6_EXTHDR   OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV6_EXTHDR, 2)
+#define OXM_OF_IPV6_EXTHDR_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV6_EXTHDR, 2)
 
 /* Bit definitions for IPv6 Extension Header pseudo-field. */
 enum ofp_ipv6exthdr_flags {