[ovs-dev] [PATCH] flow: Delete unused FWW_VLAN_TCI bit.

Ben Pfaff blp at nicira.com
Mon Nov 29 22:46:30 UTC 2010


Thanks, I pushed this.

I wasn't sure how to put a comment on code that I'd deleted, so I'll leave any
comment clarifications for later.

On Mon, Nov 29, 2010 at 2:32 PM, Justin Pettit <jpettit at nicira.com> wrote:
> Looks good.  It may be nice to indicate that VLAN wildcarding should be done with the "vlan_tci_mask" field of "flow_wildcards".
>
> --Justin
>
>
> On Nov 29, 2010, at 2:08 PM, Ben Pfaff wrote:
>
>> This wasn't used intentionally anywhere, but some code was turning it on
>> accidentally (because it was part of FWW_ALL) and other code was not, which
>> caused confusion.  In particular, the NXM code turned it on by default
>> and the OpenFlow 1.0 code did not, which caused flow stat requests to
>> return different results depending on format.  Deleting it fixes the bug.
>>
>> Reported-by: Natasha Gude <natasha at nicira.com>
>> CC: Natasha Gude <natasha at nicira.com>
>> ---
>> lib/flow.h |    5 ++---
>> 1 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/lib/flow.h b/lib/flow.h
>> index a0dc7a1..fd3246b 100644
>> --- a/lib/flow.h
>> +++ b/lib/flow.h
>> @@ -110,10 +110,9 @@ typedef unsigned int OVS_BITWISE flow_wildcards_t;
>> /* No OFPFW_* bits, but they do have corresponding OVSFW_* bits. */
>> #define FWW_TUN_ID      ((OVS_FORCE flow_wildcards_t) (1 << 8))
>> /* No corresponding OFPFW_* or OVSFW_* bits. */
>> -#define FWW_VLAN_TCI    ((OVS_FORCE flow_wildcards_t) (1 << 9)
>> -#define FWW_ETH_MCAST   ((OVS_FORCE flow_wildcards_t) (1 << 10))
>> +#define FWW_ETH_MCAST   ((OVS_FORCE flow_wildcards_t) (1 << 9))
>>                                                        /* multicast bit only */
>> -#define FWW_ALL         ((OVS_FORCE flow_wildcards_t) (((1 << 11)) - 1))
>> +#define FWW_ALL         ((OVS_FORCE flow_wildcards_t) (((1 << 10)) - 1))
>>
>> /* Information on wildcards for a flow, as a supplement to "struct flow".
>>  *
>> --
>> 1.7.1
>>
>>
>> _______________________________________________
>> dev mailing list
>> dev at openvswitch.org
>> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org
>
>




More information about the dev mailing list