X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.c;h=152d9be749725f967eae0503d77a739a2252488d;hb=58828b08f0f8b5a2ea5b88b06f48eb1db83b0938;hp=55e3494a16de28e624118cea45f0b6883789da7d;hpb=77912ae717298cb06544f1bebd9701d0b3c2f2f0;p=sliver-openvswitch.git

diff --git a/datapath/flow.c b/datapath/flow.c
index 55e3494a1..152d9be74 100644
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -1160,43 +1160,35 @@ int flow_metadata_from_nlattrs(u32 *priority, u16 *in_port, __be64 *tun_id,
 			       const struct nlattr *attr)
 {
 	const struct nlattr *nla;
-	u16 prev_type;
 	int rem;
 
 	*in_port = USHRT_MAX;
 	*tun_id = 0;
 	*priority = 0;
 
-	prev_type = OVS_KEY_ATTR_UNSPEC;
 	nla_for_each_nested(nla, attr, rem) {
 		int type = nla_type(nla);
 
-		if (type > OVS_KEY_ATTR_MAX || nla_len(nla) != ovs_key_lens[type])
-			return -EINVAL;
-
-		switch (TRANSITION(prev_type, type)) {
-		case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_PRIORITY):
-			*priority = nla_get_u32(nla);
-			break;
+		if (type <= OVS_KEY_ATTR_MAX && ovs_key_lens[type] != 0) {
+			if (nla_len(nla) != ovs_key_lens[type])
+				return -EINVAL;
 
-		case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_TUN_ID):
-		case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_TUN_ID):
-			*tun_id = nla_get_be64(nla);
-			break;
+			switch (type) {
+			case OVS_KEY_ATTR_PRIORITY:
+				*priority = nla_get_u32(nla);
+				break;
 
-		case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_IN_PORT):
-		case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_IN_PORT):
-		case TRANSITION(OVS_KEY_ATTR_TUN_ID, OVS_KEY_ATTR_IN_PORT):
-			if (nla_get_u32(nla) >= DP_MAX_PORTS)
-				return -EINVAL;
-			*in_port = nla_get_u32(nla);
-			break;
+			case OVS_KEY_ATTR_TUN_ID:
+				*tun_id = nla_get_be64(nla);
+				break;
 
-		default:
-			return 0;
+			case OVS_KEY_ATTR_IN_PORT:
+				if (nla_get_u32(nla) >= DP_MAX_PORTS)
+					return -EINVAL;
+				*in_port = nla_get_u32(nla);
+				break;
+			}
 		}
-
-		prev_type = type;
 	}
 	if (rem)
 		return -EINVAL;