From 0154b18b842527f408997639ea352b83fbb5b5b8 Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Thu, 22 Aug 2013 13:30:45 -0700 Subject: [PATCH] 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 --- datapath/flow.c | 1 - 1 file changed, 1 deletion(-) diff --git a/datapath/flow.c b/datapath/flow.c index b5206ff00..3dc1b44d1 100644 --- 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; -- 2.20.1