From: Jarno Rajahalme Date: Wed, 9 Apr 2014 18:13:57 +0000 (-0700) Subject: lib/ofp-actions: Silently discard set ip ecn/ttl actions on OpenFlow10. X-Git-Tag: sliver-openvswitch-2.2.90-1~5^2~9 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=66ce9f09aa4bc71f60c7e5ff2226cfb4d5e3bf0b;p=sliver-openvswitch.git lib/ofp-actions: Silently discard set ip ecn/ttl actions on OpenFlow10. It is better to not abort(). Signed-off-by: Jarno Rajahalme Acked-by: Ben Pfaff --- diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 5a3bf700c..ce1400462 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -2589,6 +2589,8 @@ ofpact_to_openflow10(const struct ofpact *a, struct ofpbuf *out) * follow this action. */ break; + case OFPACT_SET_IP_ECN: + case OFPACT_SET_IP_TTL: case OFPACT_CLEAR_ACTIONS: case OFPACT_WRITE_ACTIONS: case OFPACT_GOTO_TABLE: @@ -2611,8 +2613,6 @@ ofpact_to_openflow10(const struct ofpact *a, struct ofpbuf *out) case OFPACT_STACK_PUSH: case OFPACT_STACK_POP: case OFPACT_DEC_TTL: - case OFPACT_SET_IP_ECN: - case OFPACT_SET_IP_TTL: case OFPACT_SET_MPLS_LABEL: case OFPACT_SET_MPLS_TC: case OFPACT_SET_MPLS_TTL: