datapath: Remove redundant EtherType check in vlan translation.

This was supposed to be part of the previous patch but I forgot
to commit it before pushing.

Signed-off-by: Jesse Gross <jesse@nicira.com>

diff --git a/datapath/flow.c b/datapath/flow.c
index b5206ff..3dc1b44 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -1642,7 +1642,6 @@ int ovs_match_from_nlattrs(struct sw_flow_match *match,
                __be16 tci;
 
                if (!((key_attrs & (1ULL << OVS_KEY_ATTR_VLAN)) &&
-                     (key_attrs & (1ULL << OVS_KEY_ATTR_ETHERTYPE)) &&
                      (key_attrs & (1ULL << OVS_KEY_ATTR_ENCAP)))) {
                        OVS_NLERR("Invalid Vlan frame.\n");
                        return -EINVAL;