flow: Fully separate flow_wildcards from OpenFlow wildcard bits.

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

diff --git a/lib/nx-match.def b/lib/nx-match.def
index f6167af..e045d0f 100644 (file)
--- a/lib/nx-match.def
+++ b/lib/nx-match.def
@@ -18,37 +18,37 @@
         DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO)               \
         DEFINE_FIELD(HEADER##_W, WILDCARD, DL_TYPE, NW_PROTO)
 
-/*             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)
+/*             NXM_ suffix   FWW_* bit     dl_type       nw_proto      */
+/*             ------------  ------------  -----------   ------------- */
+DEFINE_FIELD  (OF_IN_PORT,   FWW_IN_PORT,  0,            0)
+DEFINE_FIELD_M(OF_ETH_DST,   0,            0,            0)
+DEFINE_FIELD  (OF_ETH_SRC,   FWW_DL_SRC,   0,            0)
+DEFINE_FIELD  (OF_ETH_TYPE,  FWW_DL_TYPE,  0,            0)
+DEFINE_FIELD_M(OF_VLAN_TCI,  0,            0,            0)
+DEFINE_FIELD  (OF_IP_TOS,    FWW_NW_TOS,   ETH_TYPE_IP,  0)
+DEFINE_FIELD  (OF_IP_PROTO,  FWW_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,   FWW_TP_SRC,   ETH_TYPE_IP,  IP_TYPE_TCP)
+DEFINE_FIELD  (OF_TCP_DST,   FWW_TP_DST,   ETH_TYPE_IP,  IP_TYPE_TCP)
+DEFINE_FIELD  (OF_UDP_SRC,   FWW_TP_SRC,   ETH_TYPE_IP,  IP_TYPE_UDP)
+DEFINE_FIELD  (OF_UDP_DST,   FWW_TP_DST,   ETH_TYPE_IP,  IP_TYPE_UDP)
+DEFINE_FIELD  (OF_ICMP_TYPE, FWW_TP_SRC,   ETH_TYPE_IP,  IP_TYPE_ICMP)
+DEFINE_FIELD  (OF_ICMP_CODE, FWW_TP_DST,   ETH_TYPE_IP,  IP_TYPE_ICMP)
+DEFINE_FIELD  (OF_ARP_OP,    FWW_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,    FWW_TUN_ID,   0,            0)
 
-DEFINE_FIELD_M(NX_REG0,      0,              0,            0)
+DEFINE_FIELD_M(NX_REG0,      0,            0,            0)
 #if FLOW_N_REGS >= 2
-DEFINE_FIELD_M(NX_REG1,      0,              0,            0)
+DEFINE_FIELD_M(NX_REG1,      0,            0,            0)
 #endif
 #if FLOW_N_REGS >= 3
-DEFINE_FIELD_M(NX_REG2,      0,              0,            0)
+DEFINE_FIELD_M(NX_REG2,      0,            0,            0)
 #endif
 #if FLOW_N_REGS >= 4
-DEFINE_FIELD_M(NX_REG3,      0,              0,            0)
+DEFINE_FIELD_M(NX_REG3,      0,            0,            0)
 #endif
 #if FLOW_N_REGS > 4
 #error