X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=datapath%2Fdatapath.c;h=218d1080fecadedcdd5c08862722c6e8b6faa197;hb=c6eab56db47739d73675ff181a03eb1923303284;hp=5e64cfb69e3896d7c1dcaf77c5fd9ac5b891e8f1;hpb=84c17d988c287619e356921f60e4033fa80cd9cd;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 5e64cfb6..218d1080 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -676,74 +676,75 @@ static int flush_flows(struct datapath *dp)
 
 static int validate_actions(const struct nlattr *actions, u32 actions_len)
 {
-        const struct nlattr *a;
-        int rem;
-
-        nla_for_each_attr(a, actions, actions_len, rem) {
-                static const u32 action_lens[ODPAT_MAX + 1] = {
-                        [ODPAT_OUTPUT] = 4,
-                        [ODPAT_CONTROLLER] = 8,
-                        [ODPAT_SET_DL_TCI] = 2,
-                        [ODPAT_STRIP_VLAN] = 0,
-                        [ODPAT_SET_DL_SRC] = ETH_ALEN,
-                        [ODPAT_SET_DL_DST] = ETH_ALEN,
-                        [ODPAT_SET_NW_SRC] = 4,
-                        [ODPAT_SET_NW_DST] = 4,
-                        [ODPAT_SET_NW_TOS] = 1,
-                        [ODPAT_SET_TP_SRC] = 2,
-                        [ODPAT_SET_TP_DST] = 2,
-                        [ODPAT_SET_TUNNEL] = 8,
-                        [ODPAT_SET_PRIORITY] = 4,
-                        [ODPAT_POP_PRIORITY] = 0,
-                        [ODPAT_DROP_SPOOFED_ARP] = 0,
-                };
-                int type = nla_type(a);
-
-                if (type > ODPAT_MAX || nla_len(a) != action_lens[type])
-                        return -EINVAL;
-
-                switch (type) {
+	const struct nlattr *a;
+	int rem;
+
+	nla_for_each_attr(a, actions, actions_len, rem) {
+		static const u32 action_lens[ODPAT_MAX + 1] = {
+			[ODPAT_OUTPUT] = 4,
+			[ODPAT_CONTROLLER] = 8,
+			[ODPAT_SET_DL_TCI] = 2,
+			[ODPAT_STRIP_VLAN] = 0,
+			[ODPAT_SET_DL_SRC] = ETH_ALEN,
+			[ODPAT_SET_DL_DST] = ETH_ALEN,
+			[ODPAT_SET_NW_SRC] = 4,
+			[ODPAT_SET_NW_DST] = 4,
+			[ODPAT_SET_NW_TOS] = 1,
+			[ODPAT_SET_TP_SRC] = 2,
+			[ODPAT_SET_TP_DST] = 2,
+			[ODPAT_SET_TUNNEL] = 8,
+			[ODPAT_SET_PRIORITY] = 4,
+			[ODPAT_POP_PRIORITY] = 0,
+			[ODPAT_DROP_SPOOFED_ARP] = 0,
+		};
+		int type = nla_type(a);
+
+		if (type > ODPAT_MAX || nla_len(a) != action_lens[type])
+			return -EINVAL;
+
+		switch (type) {
 		case ODPAT_UNSPEC:
 			return -EINVAL;
 
-                case ODPAT_CONTROLLER:
-                case ODPAT_STRIP_VLAN:
-                case ODPAT_SET_DL_SRC:
-                case ODPAT_SET_DL_DST:
-                case ODPAT_SET_NW_SRC:
-                case ODPAT_SET_NW_DST:
-                case ODPAT_SET_TP_SRC:
-                case ODPAT_SET_TP_DST:
-                case ODPAT_SET_TUNNEL:
-                case ODPAT_SET_PRIORITY:
-                case ODPAT_POP_PRIORITY:
-                case ODPAT_DROP_SPOOFED_ARP:
-                        /* No validation needed. */
-                        break;
-
-                case ODPAT_OUTPUT:
-                        if (nla_get_u32(a) >= DP_MAX_PORTS)
-                                return -EINVAL;
-
-                case ODPAT_SET_DL_TCI:
+		case ODPAT_CONTROLLER:
+		case ODPAT_STRIP_VLAN:
+		case ODPAT_SET_DL_SRC:
+		case ODPAT_SET_DL_DST:
+		case ODPAT_SET_NW_SRC:
+		case ODPAT_SET_NW_DST:
+		case ODPAT_SET_TP_SRC:
+		case ODPAT_SET_TP_DST:
+		case ODPAT_SET_TUNNEL:
+		case ODPAT_SET_PRIORITY:
+		case ODPAT_POP_PRIORITY:
+		case ODPAT_DROP_SPOOFED_ARP:
+			/* No validation needed. */
+			break;
+
+		case ODPAT_OUTPUT:
+			if (nla_get_u32(a) >= DP_MAX_PORTS)
+				return -EINVAL;
+			break;
+
+		case ODPAT_SET_DL_TCI:
 			if (nla_get_be16(a) & htons(VLAN_CFI_MASK))
 				return -EINVAL;
-                        break;
+			break;
 
-                case ODPAT_SET_NW_TOS:
-                        if (nla_get_u8(a) & INET_ECN_MASK)
-                                return -EINVAL;
-                        break;
+		case ODPAT_SET_NW_TOS:
+			if (nla_get_u8(a) & INET_ECN_MASK)
+				return -EINVAL;
+			break;
 
-                default:
-                        return -EOPNOTSUPP;
-                }
-        }
+		default:
+			return -EOPNOTSUPP;
+		}
+	}
 
-        if (rem > 0)
-                return -EINVAL;
+	if (rem > 0)
+		return -EINVAL;
 
-        return 0;
+	return 0;
 }
 
 static struct sw_flow_actions *get_actions(const struct odp_flow *flow)