meta-flow: Split ICMP into ICMPv4 and ICMPv6.

[sliver-openvswitch.git] / lib / nx-match.def

diff --git a/lib/nx-match.def b/lib/nx-match.def
index ea032fc..0426edf 100644 (file)
--- a/lib/nx-match.def
+++ b/lib/nx-match.def
@@ -35,8 +35,8 @@ DEFINE_FIELD  (OF_TCP_SRC,    MFF_TCP_SRC,    true)
 DEFINE_FIELD  (OF_TCP_DST,    MFF_TCP_DST,    true)
 DEFINE_FIELD  (OF_UDP_SRC,    MFF_UDP_SRC,    true)
 DEFINE_FIELD  (OF_UDP_DST,    MFF_UDP_DST,    true)
-DEFINE_FIELD  (OF_ICMP_TYPE,  MFF_ICMP_TYPE, false)
-DEFINE_FIELD  (OF_ICMP_CODE,  MFF_ICMP_CODE, false)
+DEFINE_FIELD  (OF_ICMP_TYPE,  MFF_ICMPV4_TYPE, false)
+DEFINE_FIELD  (OF_ICMP_CODE,  MFF_ICMPV4_CODE, false)
 DEFINE_FIELD  (OF_ARP_OP,     MFF_ARP_OP,    false)
 DEFINE_FIELD_M(OF_ARP_SPA,    MFF_ARP_SPA,   false)
 DEFINE_FIELD_M(OF_ARP_TPA,    MFF_ARP_TPA,   false)
@@ -48,8 +48,8 @@ DEFINE_FIELD  (NX_IPV6_LABEL, MFF_IPV6_LABEL,false)
 DEFINE_FIELD  (NX_IP_ECN,     MFF_IP_ECN,     true)
 DEFINE_FIELD  (NX_IP_TTL,     MFF_IP_TTL,     true)
 /* XXX should we have MFF_ICMPV4_TYPE and MFF_ICMPV6_TYPE? */
-DEFINE_FIELD  (NX_ICMPV6_TYPE,MFF_ICMP_TYPE, false)
-DEFINE_FIELD  (NX_ICMPV6_CODE,MFF_ICMP_CODE, false)
+DEFINE_FIELD  (NX_ICMPV6_TYPE,MFF_ICMPV6_TYPE, false)
+DEFINE_FIELD  (NX_ICMPV6_CODE,MFF_ICMPV6_CODE, false)
 DEFINE_FIELD  (NX_ND_TARGET,  MFF_ND_TARGET, false)
 DEFINE_FIELD  (NX_ND_SLL,     MFF_ND_SLL,    false)
 DEFINE_FIELD  (NX_ND_TLL,     MFF_ND_TLL,    false)