flow: Delete unused FWW_VLAN_TCI bit.

This wasn't used intentionally anywhere, but some code was turning it on
accidentally (because it was part of FWW_ALL) and other code was not, which
caused confusion.  In particular, the NXM code turned it on by default
and the OpenFlow 1.0 code did not, which caused flow stat requests to
return different results depending on format.  Deleting it fixes the bug.

Reported-by: Natasha Gude <natasha@nicira.com>
CC: Natasha Gude <natasha@nicira.com>

diff --git a/lib/flow.h b/lib/flow.h
index a0dc7a18d03b99e8f3c979a97680e69f77fefd74..fd3246b6a4d453b52427d7aa0b348a1318477d49 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".
  *