ofp-actions: Fix conntrack action usable_protocols handling.
authorJarno Rajahalme <jrajahalme@nicira.com>
Wed, 4 Nov 2015 23:47:36 +0000 (15:47 -0800)
committerJarno Rajahalme <jrajahalme@nicira.com>
Thu, 5 Nov 2015 02:39:16 +0000 (18:39 -0800)
commit76e3e6695ef0ac8f97f950a1fff4ef4ec23afe97
tree810479b6812d933b1459fa486715a3e2c4e02ad5
parentf3abc57bbfc581eb399a388e94db1a8923243fb4
ofp-actions: Fix conntrack action usable_protocols handling.

Restrictions from embedded actions should be folded in rather than
discarded.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Joe Stringer <joestringer@nicira.com>
lib/ofp-actions.c