mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

OF 1.1 pop vlan compatibility.

Browse Source 
Store the original action code with the strip vlan action,
so that it can be printed back properly.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Jarno Rajahalme
2013-10-24 13:19:26 -07:00
committed by Ben Pfaff
parent c197ef5043
commit 64fcc07313
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ofp-actions.c
View File

@@ -539,7 +539,7 @@ ofpact_from_openflow10(const union ofp_action *a, struct ofpbuf *out)
break;
case OFPUTIL_OFPAT10_STRIP_VLAN:
ofpact_put_STRIP_VLAN(out);
ofpact_put_STRIP_VLAN(out)->ofpact.compat = code;
break;
case OFPUTIL_OFPAT10_SET_DL_SRC:
@@ -828,7 +828,7 @@ ofpact_from_openflow11(const union ofp_action *a, struct ofpbuf *out)
break;
case OFPUTIL_OFPAT11_POP_VLAN:
ofpact_put_STRIP_VLAN(out);
ofpact_put_STRIP_VLAN(out)->ofpact.compat = code;
break;
case OFPUTIL_OFPAT11_SET_QUEUE:
@@ -2772,7 +2772,8 @@ ofpact_format(const struct ofpact *a, struct ds *s)
break;
case OFPACT_STRIP_VLAN:
ds_put_cstr(s, "strip_vlan");
ds_put_cstr(s, a->compat == OFPUTIL_OFPAT11_POP_VLAN
? "pop_vlan" : "strip_vlan");
break;
case OFPACT_PUSH_VLAN: