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

Always insert MPLS labels after VLAN tags.

Browse Source 
OpenFlow 1.1 and 1.2 always inserted MPLS labels after VLAN tags.
OpenFlow 1.3 and 1.4 insert MPLS labels before VLAN tags.
OpenFlow 1.3.4 and 1.5, both in preparation, recognize that the change in
1.3 was an error and revert it.  This commit implements that reversion
in Open vSwitch.

EXT-457.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Ben Pfaff
2014-02-04 12:39:37 -08:00
parent 0070679ff7
commit 269dc90a0a
5 changed files with 9 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ofp-actions.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -286,8 +286,7 @@ sample_from_openflow(const struct nx_action_sample *nas,
}
static enum ofperr
push_mpls_from_openflow(ovs_be16 ethertype, enum ofpact_mpls_position position,
struct ofpbuf *out)
push_mpls_from_openflow(ovs_be16 ethertype, struct ofpbuf *out)
{
struct ofpact_push_mpls *oam;
@@ -296,7 +295,6 @@ push_mpls_from_openflow(ovs_be16 ethertype, enum ofpact_mpls_position position,
}
oam = ofpact_put_PUSH_MPLS(out);
oam->ethertype = ethertype;
oam->position = position;
return 0;
}
@@ -473,8 +471,7 @@ ofpact_from_nxast(const union ofp_action *a, enum ofputil_action_code code,
break;
case OFPUTIL_NXAST_PUSH_MPLS:
error = push_mpls_from_openflow(a->push_mpls.ethertype,
OFPACT_MPLS_AFTER_VLAN, out);
error = push_mpls_from_openflow(a->push_mpls.ethertype, out);
break;
case OFPUTIL_NXAST_SET_MPLS_LABEL:
@@ -1255,11 +1252,7 @@ ofpact_from_openflow11(const union ofp_action *a, enum ofp_version version,
break;
case OFPUTIL_OFPAT11_PUSH_MPLS:
/* OpenFlow 1.3 has different semantics. */
error = push_mpls_from_openflow(a->push.ethertype,
version >= OFP13_VERSION ?
OFPACT_MPLS_BEFORE_VLAN :
OFPACT_MPLS_AFTER_VLAN, out);
error = push_mpls_from_openflow(a->push.ethertype, out);
break;
case OFPUTIL_OFPAT11_POP_MPLS: