ofp-util: Fix starting offset of OpenFlow error messages.

[openvswitch] / lib / flow.h

diff --git a/lib/flow.h b/lib/flow.h
index a0dc7a18d03b99e8f3c979a97680e69f77fefd74..1509a7d121913da7961e6c1376a0f35bc0fb9eb5 100644 (file)
--- a/lib/flow.h
+++ b/lib/flow.h
@@ -110,10 +110,9 @@ typedef unsigned int OVS_BITWISE flow_wildcards_t;
 /* No OFPFW_* bits, but they do have corresponding OVSFW_* bits. */
 #define FWW_TUN_ID      ((OVS_FORCE flow_wildcards_t) (1 << 8))
 /* No corresponding OFPFW_* or OVSFW_* bits. */
-#define FWW_VLAN_TCI    ((OVS_FORCE flow_wildcards_t) (1 << 9)
-#define FWW_ETH_MCAST   ((OVS_FORCE flow_wildcards_t) (1 << 10))
+#define FWW_ETH_MCAST   ((OVS_FORCE flow_wildcards_t) (1 << 9))
                                                        /* multicast bit only */
-#define FWW_ALL         ((OVS_FORCE flow_wildcards_t) (((1 << 11)) - 1))
+#define FWW_ALL         ((OVS_FORCE flow_wildcards_t) (((1 << 10)) - 1))
 
 /* Information on wildcards for a flow, as a supplement to "struct flow".
  *
@@ -125,6 +124,7 @@ struct flow_wildcards {
     ovs_be32 nw_src_mask;       /* 1-bit in each significant nw_src bit. */
     ovs_be32 nw_dst_mask;       /* 1-bit in each significant nw_dst bit. */
     ovs_be16 vlan_tci_mask;     /* 1-bit in each significant vlan_tci bit. */
+    uint16_t zero;              /* Padding field set to zero. */
 };
 
 void flow_wildcards_init_catchall(struct flow_wildcards *);