X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fodp-execute.c;h=12ad67981d3ae325a46a1681d2082e6b42bef178;hb=c5cf10598f8c9f4428291e9df3ecd72a05fb1ccf;hp=ac0dac0dd362fbcee74b64d7982d5bc0228a8b35;hpb=cf3b7538666cd1efa314ce4944e4efdf3dd81d99;p=sliver-openvswitch.git diff --git a/lib/odp-execute.c b/lib/odp-execute.c index ac0dac0dd..12ad67981 100644 --- a/lib/odp-execute.c +++ b/lib/odp-execute.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * Copyright (c) 2013 Simon Horman * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -208,11 +208,13 @@ odp_execute_actions__(void *dp, struct ofpbuf *packet, bool steal, case OVS_ACTION_ATTR_OUTPUT: case OVS_ACTION_ATTR_USERSPACE: case OVS_ACTION_ATTR_RECIRC: + case OVS_ACTION_ATTR_HASH: if (dp_execute_action) { - bool may_steal; /* Allow 'dp_execute_action' to steal the packet data if we do * not need it any more. */ - may_steal = steal && (!more_actions && left <= NLA_ALIGN(a->nla_len)); + bool may_steal = steal && (!more_actions + && left <= NLA_ALIGN(a->nla_len) + && type != OVS_ACTION_ATTR_RECIRC); dp_execute_action(dp, packet, md, a, may_steal); } break;