X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnx-match.def;h=3fcb59cc03c410b588066db6402896f1f134fa56;hb=f6749eeaea2dd15f195ade25db627d5275903b59;hp=215e71aae79e804178070058bd0bcb6ef19fee86;hpb=084f529087b7d3a3b3e0df470ad4ad39800cbab5;p=sliver-openvswitch.git

diff --git a/lib/nx-match.def b/lib/nx-match.def
index 215e71aae..3fcb59cc0 100644
--- a/lib/nx-match.def
+++ b/lib/nx-match.def
@@ -26,36 +26,36 @@
     DEFINE_FIELD(HEADER, WILDCARD, DL_TYPES, NW_PROTO, WRITABLE)        \
     DEFINE_FIELD(HEADER##_W, WILDCARD, DL_TYPES, NW_PROTO, false)
 
-/*             NXM_ suffix     FWW_* bit     dl_types       nw_proto      rw? */
-/*             ------------    ------------  -----------    ------------- --- */
-DEFINE_FIELD_M(NX_TUN_ID,      0,            NXM_DL_NONE,   0,            true)
-DEFINE_FIELD  (OF_IN_PORT,     FWW_IN_PORT,  NXM_DL_NONE,   0,            false)
-DEFINE_FIELD_M(OF_ETH_DST,     0,            NXM_DL_NONE,   0,            true)
-DEFINE_FIELD  (OF_ETH_SRC,     FWW_DL_SRC,   NXM_DL_NONE,   0,            true)
-DEFINE_FIELD  (OF_ETH_TYPE,    FWW_DL_TYPE,  NXM_DL_NONE,   0,            false)
-DEFINE_FIELD_M(OF_VLAN_TCI,    0,            NXM_DL_NONE,   0,            true)
-DEFINE_FIELD  (OF_IP_TOS,      FWW_NW_TOS,   NXM_DL_IP_ANY, 0,            true)
-DEFINE_FIELD  (OF_IP_PROTO,    FWW_NW_PROTO, NXM_DL_IP_ANY, 0,            false)
-DEFINE_FIELD_M(OF_IP_SRC,      0,            NXM_DL_IP,     0,            true)
-DEFINE_FIELD_M(OF_IP_DST,      0,            NXM_DL_IP,     0,            true)
-DEFINE_FIELD  (OF_TCP_SRC,     FWW_TP_SRC,   NXM_DL_IP_ANY, IPPROTO_TCP,  true)
-DEFINE_FIELD  (OF_TCP_DST,     FWW_TP_DST,   NXM_DL_IP_ANY, IPPROTO_TCP,  true)
-DEFINE_FIELD  (OF_UDP_SRC,     FWW_TP_SRC,   NXM_DL_IP_ANY, IPPROTO_UDP,  true)
-DEFINE_FIELD  (OF_UDP_DST,     FWW_TP_DST,   NXM_DL_IP_ANY, IPPROTO_UDP,  true)
-DEFINE_FIELD  (OF_ICMP_TYPE,   FWW_TP_SRC,   NXM_DL_IP,     IPPROTO_ICMP, false)
-DEFINE_FIELD  (OF_ICMP_CODE,   FWW_TP_DST,   NXM_DL_IP,     IPPROTO_ICMP, false)
-DEFINE_FIELD  (OF_ARP_OP,      FWW_NW_PROTO, NXM_DL_ARP,    0,            false)
-DEFINE_FIELD_M(OF_ARP_SPA,     0,            NXM_DL_ARP,    0,            false)
-DEFINE_FIELD_M(OF_ARP_TPA,     0,            NXM_DL_ARP,    0,            false)
-DEFINE_FIELD  (NX_ARP_SHA,     FWW_ARP_SHA,  NXM_DL_ARP,    0,            false)
-DEFINE_FIELD  (NX_ARP_THA,     FWW_ARP_THA,  NXM_DL_ARP,    0,            false)
-DEFINE_FIELD_M(NX_IPV6_SRC,    0,            NXM_DL_IPV6,   0,            false)
-DEFINE_FIELD_M(NX_IPV6_DST,    0,            NXM_DL_IPV6,   0,            false)
-DEFINE_FIELD  (NX_ICMPV6_TYPE, FWW_TP_SRC,   NXM_DL_IPV6, IPPROTO_ICMPV6, false)
-DEFINE_FIELD  (NX_ICMPV6_CODE, FWW_TP_DST,   NXM_DL_IPV6, IPPROTO_ICMPV6, false)
-DEFINE_FIELD  (NX_ND_TARGET,   FWW_ND_TARGET,NXM_DL_IPV6, IPPROTO_ICMPV6, false)
-DEFINE_FIELD  (NX_ND_SLL,      FWW_ARP_SHA,  NXM_DL_IPV6, IPPROTO_ICMPV6, false)
-DEFINE_FIELD  (NX_ND_TLL,      FWW_ARP_THA,  NXM_DL_IPV6, IPPROTO_ICMPV6, false)
+/*             NXM_ suffix    FWW_* bit     dl_types       nw_proto      rw? */
+/*             ------------   ------------  -----------    ------------- --- */
+DEFINE_FIELD_M(NX_TUN_ID,     0,            NXM_DL_NONE,   0,            true)
+DEFINE_FIELD  (OF_IN_PORT,    FWW_IN_PORT,  NXM_DL_NONE,   0,            false)
+DEFINE_FIELD_M(OF_ETH_DST,    0,            NXM_DL_NONE,   0,            true)
+DEFINE_FIELD  (OF_ETH_SRC,    FWW_DL_SRC,   NXM_DL_NONE,   0,            true)
+DEFINE_FIELD  (OF_ETH_TYPE,   FWW_DL_TYPE,  NXM_DL_NONE,   0,            false)
+DEFINE_FIELD_M(OF_VLAN_TCI,   0,            NXM_DL_NONE,   0,            true)
+DEFINE_FIELD  (OF_IP_TOS,     FWW_NW_TOS,   NXM_DL_IP_ANY, 0,            true)
+DEFINE_FIELD  (OF_IP_PROTO,   FWW_NW_PROTO, NXM_DL_IP_ANY, 0,            false)
+DEFINE_FIELD_M(OF_IP_SRC,     0,            NXM_DL_IP,     0,            true)
+DEFINE_FIELD_M(OF_IP_DST,     0,            NXM_DL_IP,     0,            true)
+DEFINE_FIELD  (OF_TCP_SRC,    FWW_TP_SRC,   NXM_DL_IP_ANY, IPPROTO_TCP,  true)
+DEFINE_FIELD  (OF_TCP_DST,    FWW_TP_DST,   NXM_DL_IP_ANY, IPPROTO_TCP,  true)
+DEFINE_FIELD  (OF_UDP_SRC,    FWW_TP_SRC,   NXM_DL_IP_ANY, IPPROTO_UDP,  true)
+DEFINE_FIELD  (OF_UDP_DST,    FWW_TP_DST,   NXM_DL_IP_ANY, IPPROTO_UDP,  true)
+DEFINE_FIELD  (OF_ICMP_TYPE,  FWW_TP_SRC,   NXM_DL_IP,     IPPROTO_ICMP, false)
+DEFINE_FIELD  (OF_ICMP_CODE,  FWW_TP_DST,   NXM_DL_IP,     IPPROTO_ICMP, false)
+DEFINE_FIELD  (OF_ARP_OP,     FWW_NW_PROTO, NXM_DL_ARP,    0,            false)
+DEFINE_FIELD_M(OF_ARP_SPA,    0,            NXM_DL_ARP,    0,            false)
+DEFINE_FIELD_M(OF_ARP_TPA,    0,            NXM_DL_ARP,    0,            false)
+DEFINE_FIELD  (NX_ARP_SHA,    FWW_ARP_SHA,  NXM_DL_ARP,    0,            false)
+DEFINE_FIELD  (NX_ARP_THA,    FWW_ARP_THA,  NXM_DL_ARP,    0,            false)
+DEFINE_FIELD_M(NX_IPV6_SRC,   0,            NXM_DL_IPV6,   0,            false)
+DEFINE_FIELD_M(NX_IPV6_DST,   0,            NXM_DL_IPV6,   0,            false)
+DEFINE_FIELD  (NX_ICMPV6_TYPE,FWW_TP_SRC,   NXM_DL_IPV6, IPPROTO_ICMPV6, false)
+DEFINE_FIELD  (NX_ICMPV6_CODE,FWW_TP_DST,   NXM_DL_IPV6, IPPROTO_ICMPV6, false)
+DEFINE_FIELD  (NX_ND_TARGET,  FWW_ND_TARGET,NXM_DL_IPV6, IPPROTO_ICMPV6, false)
+DEFINE_FIELD  (NX_ND_SLL,     FWW_ARP_SHA,  NXM_DL_IPV6, IPPROTO_ICMPV6, false)
+DEFINE_FIELD  (NX_ND_TLL,     FWW_ARP_THA,  NXM_DL_IPV6, IPPROTO_ICMPV6, false)
 
 DEFINE_FIELD_M(NX_REG0,        0,            NXM_DL_NONE,   0,            true)
 #if FLOW_N_REGS >= 2