From 53e1d6f1ef360cb1b2daa70f4e65f9f5c02db2f9 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Thu, 13 Nov 2014 15:03:39 -0800 Subject: [PATCH] dpif-netdev: Remove redundant hash action handling. odp_execute_actions() already handles hash execution part. Signed-off-by: Pravin B Shelar Acked-by: Jarno Rajahalme --- lib/dpif-netdev.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 5e76dcd25db..f184a35a166 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -3128,34 +3128,6 @@ dp_execute_cb(void *aux_, struct dpif_packet **packets, int cnt, } break; - case OVS_ACTION_ATTR_HASH: { - const struct ovs_action_hash *hash_act; - uint32_t hash; - - hash_act = nl_attr_get(a); - - for (i = 0; i < cnt; i++) { - - if (hash_act->hash_alg == OVS_HASH_ALG_L4) { - /* Hash need not be symmetric, nor does it need to include - * L2 fields. */ - hash = hash_2words(dpif_packet_get_dp_hash(packets[i]), - hash_act->hash_basis); - } else { - VLOG_WARN("Unknown hash algorithm specified " - "for the hash action."); - hash = 2; - } - - if (!hash) { - hash = 1; /* 0 is not valid */ - } - - dpif_packet_set_dp_hash(packets[i], hash); - } - return; - } - case OVS_ACTION_ATTR_RECIRC: if (*depth < MAX_RECIRC_DEPTH) { @@ -3188,6 +3160,7 @@ dp_execute_cb(void *aux_, struct dpif_packet **packets, int cnt, case OVS_ACTION_ATTR_SET: case OVS_ACTION_ATTR_SET_MASKED: case OVS_ACTION_ATTR_SAMPLE: + case OVS_ACTION_ATTR_HASH: case OVS_ACTION_ATTR_UNSPEC: case __OVS_ACTION_ATTR_MAX: OVS_NOT_REACHED();