[ Cc Jarno Rajahalme ]
On Fri, Nov 15, 2013 at 02:33:15PM -0800, Ben Pfaff wrote:
> Currently Open vSwitch does not implement OpenFlow1.3+ tag ordering
> so it makes sense to enforce consistency checking in the way that OVS does
> actually implement tag ordering.
>
> Signed-off-by: Ben Pfaff <b...@nicira.com>
Hi Ben,
I believe that the logic that this patch removes is not related
to OpenFlow1.3+ tag ordering. Rather I believe it was added by
Jarno Rajahalme to handle encoding of OpenFlow1.0 actions in OpenFlow 1.1+.
As such I don't think it should be removed.
> ---
> lib/ofp-actions.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
> index e07ea1d..bd2fd2e 100644
> --- a/lib/ofp-actions.c
> +++ b/lib/ofp-actions.c
> @@ -1920,8 +1920,7 @@ ofpact_check__(enum ofputil_protocol *usable_protocols,
> struct ofpact *a,
> * OpenFlow 1.1+ if need be. */
> ofpact_get_SET_VLAN_VID(a)->flow_has_vlan =
> (flow->vlan_tci & htons(VLAN_CFI)) == htons(VLAN_CFI);
> - if (!(flow->vlan_tci & htons(VLAN_CFI)) &&
> - !ofpact_get_SET_VLAN_VID(a)->push_vlan_if_needed) {
> + if (!(flow->vlan_tci & htons(VLAN_CFI))) {
> inconsistent_match(usable_protocols);
> }
> /* Temporary mark that we have a vlan tag. */
> @@ -1933,8 +1932,7 @@ ofpact_check__(enum ofputil_protocol *usable_protocols,
> struct ofpact *a,
> * OpenFlow 1.1+ if need be. */
> ofpact_get_SET_VLAN_PCP(a)->flow_has_vlan =
> (flow->vlan_tci & htons(VLAN_CFI)) == htons(VLAN_CFI);
> - if (!(flow->vlan_tci & htons(VLAN_CFI)) &&
> - !ofpact_get_SET_VLAN_PCP(a)->push_vlan_if_needed) {
> + if (!(flow->vlan_tci & htons(VLAN_CFI))) {
> inconsistent_match(usable_protocols);
> }
> /* Temporary mark that we have a vlan tag. */
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
