X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnx-match.def;h=4a42aaa47bfe999d015a9ea79600f3a337fe6b74;hb=1c0b7503afdd750a7f2cadcd63b65d64889366c9;hp=f6167af43cd9f643d3d2002e60280fe354b28bdf;hpb=1e37a2d75196c6e10ac078213ad94afb4f3e219a;p=sliver-openvswitch.git

diff --git a/lib/nx-match.def b/lib/nx-match.def
index f6167af43..4a42aaa47 100644
--- a/lib/nx-match.def
+++ b/lib/nx-match.def
@@ -1,5 +1,5 @@
 /*                                                                -*- c -*-
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,41 +14,58 @@
  * limitations under the License.
  */
 
-#define DEFINE_FIELD_M(HEADER, WILDCARD, DL_TYPE, NW_PROTO)             \
-        DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO)               \
-        DEFINE_FIELD(HEADER##_W, WILDCARD, DL_TYPE, NW_PROTO)
+#define N_NXM_DL_TYPES 2
 
-/*             NXM_ bit      OFPFW_* bit     dl_type       nw_proto      */
-/*             ------------  --------------  -----------   ------------- */
-DEFINE_FIELD  (OF_IN_PORT,   OFPFW_IN_PORT,  0,            0)
-DEFINE_FIELD_M(OF_ETH_DST,   0,              0,            0)
-DEFINE_FIELD  (OF_ETH_SRC,   OFPFW_DL_SRC,   0,            0)
-DEFINE_FIELD  (OF_ETH_TYPE,  OFPFW_DL_TYPE,  0,            0)
-DEFINE_FIELD_M(OF_VLAN_TCI,  0,              0,            0)
-DEFINE_FIELD  (OF_IP_TOS,    OFPFW_NW_TOS,   ETH_TYPE_IP,  0)
-DEFINE_FIELD  (OF_IP_PROTO,  OFPFW_NW_PROTO, ETH_TYPE_IP,  0)
-DEFINE_FIELD_M(OF_IP_SRC,    0,              ETH_TYPE_IP,  0)
-DEFINE_FIELD_M(OF_IP_DST,    0,              ETH_TYPE_IP,  0)
-DEFINE_FIELD  (OF_TCP_SRC,   OFPFW_TP_SRC,   ETH_TYPE_IP,  IP_TYPE_TCP)
-DEFINE_FIELD  (OF_TCP_DST,   OFPFW_TP_DST,   ETH_TYPE_IP,  IP_TYPE_TCP)
-DEFINE_FIELD  (OF_UDP_SRC,   OFPFW_TP_SRC,   ETH_TYPE_IP,  IP_TYPE_UDP)
-DEFINE_FIELD  (OF_UDP_DST,   OFPFW_TP_DST,   ETH_TYPE_IP,  IP_TYPE_UDP)
-DEFINE_FIELD  (OF_ICMP_TYPE, OFPFW_TP_SRC,   ETH_TYPE_IP,  IP_TYPE_ICMP)
-DEFINE_FIELD  (OF_ICMP_CODE, OFPFW_TP_DST,   ETH_TYPE_IP,  IP_TYPE_ICMP)
-DEFINE_FIELD  (OF_ARP_OP,    OFPFW_NW_PROTO, ETH_TYPE_ARP, 0)
-DEFINE_FIELD_M(OF_ARP_SPA,   0,              ETH_TYPE_ARP, 0)
-DEFINE_FIELD_M(OF_ARP_TPA,   0,              ETH_TYPE_ARP, 0)
-DEFINE_FIELD  (NX_TUN_ID,    NXFW_TUN_ID,    0,            0)
+#define NXM_DL_NONE   (0, 0)
+#define NXM_DL_ARP    (ETH_TYPE_ARP, 0)
+#define NXM_DL_IP     (ETH_TYPE_IP, 0)
+#define NXM_DL_IPV6   (ETH_TYPE_IPV6, 0)
+#define NXM_DL_IP_ANY (ETH_TYPE_IP, ETH_TYPE_IPV6)
 
-DEFINE_FIELD_M(NX_REG0,      0,              0,            0)
+#define DEFINE_FIELD_M(HEADER, WILDCARD, DL_TYPES, NW_PROTO, WRITABLE)  \
+    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,            false)
+DEFINE_FIELD  (OF_ETH_SRC,     FWW_DL_SRC,   NXM_DL_NONE,   0,            false)
+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,            false)
+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,            false)
+DEFINE_FIELD_M(OF_IP_DST,      0,            NXM_DL_IP,     0,            false)
+DEFINE_FIELD  (OF_TCP_SRC,     FWW_TP_SRC,   NXM_DL_IP_ANY, IPPROTO_TCP,  false)
+DEFINE_FIELD  (OF_TCP_DST,     FWW_TP_DST,   NXM_DL_IP_ANY, IPPROTO_TCP,  false)
+DEFINE_FIELD  (OF_UDP_SRC,     FWW_TP_SRC,   NXM_DL_IP_ANY, IPPROTO_UDP,  false)
+DEFINE_FIELD  (OF_UDP_DST,     FWW_TP_DST,   NXM_DL_IP_ANY, IPPROTO_UDP,  false)
+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
-DEFINE_FIELD_M(NX_REG1,      0,              0,            0)
+DEFINE_FIELD_M(NX_REG1,        0,            NXM_DL_NONE,   0,            true)
 #endif
 #if FLOW_N_REGS >= 3
-DEFINE_FIELD_M(NX_REG2,      0,              0,            0)
+DEFINE_FIELD_M(NX_REG2,        0,            NXM_DL_NONE,   0,            true)
 #endif
 #if FLOW_N_REGS >= 4
-DEFINE_FIELD_M(NX_REG3,      0,              0,            0)
+DEFINE_FIELD_M(NX_REG3,        0,            NXM_DL_NONE,   0,            true)
 #endif
 #if FLOW_N_REGS > 4
 #error