[ovs-dev] [PATCH]: Trio of small fixes

Ben Pfaff blp at nicira.com
Thu Oct 28 16:52:51 UTC 2010


Thank you for the patches.  I'll look at each of them separately.

On Wed, Oct 27, 2010 at 06:19:57PM -0700, Jean Tourrilhes wrote:
> diff -u -p -r -x '*~' -x '*.cmd' -x '*.order' -x '*.mod' openvswitch-1.0.1-jean-2/datapath/datapath.c openvswitch-1.0.1-jean-3/datapath/datapath.c
> --- openvswitch-1.0.1-jean-2/datapath/datapath.c	2010-08-24 15:58:56.000000000 -0700
> +++ openvswitch-1.0.1-jean-3/datapath/datapath.c	2010-08-24 15:59:24.000000000 -0700
> @@ -893,6 +893,9 @@ static int validate_actions(struct datap
>  				return -EINVAL;
>  			break;
>  
> +		case ODPAT_STRIP_VLAN:
> +			break;
> +
>  		case ODPAT_SET_NW_TOS:
>  			if (a->nw_tos.nw_tos & INET_ECN_MASK)
>  				return -EINVAL;


What version of OVS does this fix?  It looks like it would apply OK to
v1.0.1, but there it should not be necessary because of:

                default:
                        if (a->type >= ODPAT_N_ACTIONS)
                                return -EOPNOTSUPP;
                        break;

ODPAT_STRIP_VLAN is, of course, less than ODPAT_N_ACTIONS.

It doesn't apply to "master", but it doesn't look necessary there
either, since ODPAT_STRIP_VLAN is already handled in the switch there.




More information about the dev mailing list