openflow/field: Fix broken NXOXM/ONFOXM fields

priv/openflow_enum_gen.exs

@@ -304,7 +304,8 @@ enums = [
     no_buffer: 0xFFFF
   ],
   experimenter_oxm_vendors: [
-    nicira_ext_match: 0x00002320,
+    nxoxm_nsh_match: 0x005AD650,
+    nxoxm_match: 0x00002320,
     hp_ext_match: 0x00002428,
     onf_ext_match: 0x4F4E4600
   ],
@@ -571,7 +572,7 @@ enums = [
     xreg6: 6,
     xreg7: 7
   ],
-  nicira_ext_match: [
+  nxoxm_nsh_match: [
     nsh_flags: 1,
     nsh_mdtype: 2,
     nsh_np: 3,
@@ -588,6 +589,13 @@ enums = [
     onf_actset_output: 43,
     onf_pbb_uca: 2560
   ],
+  nxoxm_match: [
+    nxoxm_dp_hash: 0,
+    tun_erspan_idx: 11,
+    tun_erspan_ver: 12,
+    tun_erspan_dir: 13,
+    tun_erspan_hwid: 14
+  ],
   buffer_id: [
     no_buffer: 0xFFFFFFFF
   ],