diff options
| author | Ben Pfaff <blp@nicira.com> | 2014-02-04 12:39:37 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2014-02-06 17:13:46 -0800 |
| commit | 269dc90a0a090f2b40e55b4572ac5edeb1684b7d (patch) | |
| tree | 399abd9b0872d21364a087f858c298b407435440 /include/linux | |
| parent | 0070679ff7209cb29398a16c15569cb86d49834c (diff) | |
| download | openvswitch-269dc90a0a090f2b40e55b4572ac5edeb1684b7d.tar.gz | |
Always insert MPLS labels after VLAN tags.
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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/openvswitch.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h index 5137c2f59..d1ff5ec7b 100644 --- a/include/linux/openvswitch.h +++ b/include/linux/openvswitch.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2013 Nicira, Inc. + * Copyright (c) 2007-2014 Nicira, Inc. * * This file is offered under your choice of two licenses: Apache 2.0 or GNU * GPL 2.0 or later. The permission statements for each of these licenses is @@ -545,13 +545,13 @@ struct ovs_action_push_vlan { * single nested %OVS_KEY_ATTR_* attribute specifies a header to modify and its * value. * @OVS_ACTION_ATTR_PUSH_MPLS: Push a new MPLS label stack entry onto the - * top of the packets MPLS label stack. Set the ethertype of the + * top of the packets MPLS label stack. Set the ethertype of the * encapsulating frame to either %ETH_P_MPLS_UC or %ETH_P_MPLS_MC to * indicate the new packet contents. * @OVS_ACTION_ATTR_POP_MPLS: Pop an MPLS label stack entry off of the * packet's MPLS label stack. Set the encapsulating frame's ethertype to - * indicate the new packet contents This could potentially still be - * %ETH_P_MPLS_* if the resulting MPLS label stack is not empty. If there + * indicate the new packet contents. This could potentially still be + * %ETH_P_MPLS if the resulting MPLS label stack is not empty. If there * is no MPLS label stack, as determined by ethertype, no action is taken. * * Only a single header can be set with a single %OVS_ACTION_ATTR_SET. Not all |