[ovs-dev] [PATCH 1/2] datapath: Update comments about 'OVS_KEY_ATTR_8021Q'.

Justin Pettit jpettit at nicira.com
Thu Aug 7 21:35:01 UTC 2014


On August 7, 2014 at 10:09:17 AM, Pravin Shelar (pshelar at nicira.com) wrote:
> On Wed, Aug 6, 2014 at 2:55 PM, Justin Pettit wrote:
> > Commit fea393b1 (datapath: Describe policy for extending flow key,
> > implement needed changes.) changed the key 'OVS_KEY_ATTR_8021Q' to
> > 'OVS_KEY_ATTR_VLAN' and the size of the attribute structure. A couple
> > of comments were missed, so this commit updates them.
> >
> > Signed-off-by: Justin Pettit  
> > ---
> > datapath/datapath.c | 2 +-
> > lib/odp-util.h | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/datapath/datapath.c b/datapath/datapath.c
> > index 1185f60..26d060e 100644
> > --- a/datapath/datapath.c
> > +++ b/datapath/datapath.c
> > @@ -409,7 +409,7 @@ static size_t key_attr_size(void)
> > + nla_total_size(4) /* OVS_KEY_ATTR_RECIRC_ID */
> > + nla_total_size(12) /* OVS_KEY_ATTR_ETHERNET */
> > + nla_total_size(2) /* OVS_KEY_ATTR_ETHERTYPE */
> > - + nla_total_size(4) /* OVS_KEY_ATTR_8021Q */
> > + + nla_total_size(4) /* OVS_KEY_ATTR_VLAN */
> > + nla_total_size(0) /* OVS_KEY_ATTR_ENCAP */
> > + nla_total_size(2) /* OVS_KEY_ATTR_ETHERTYPE */
> > + nla_total_size(40) /* OVS_KEY_ATTR_IPV6 */
> > diff --git a/lib/odp-util.h b/lib/odp-util.h
> > index 82ab06d..a0c0ae8 100644
> > --- a/lib/odp-util.h
> > +++ b/lib/odp-util.h
> > @@ -112,7 +112,7 @@ void odp_portno_names_destroy(struct hmap *portno_names);  
> > * OVS_KEY_ATTR_RECIRC_ID 4 -- 4 8
> > * OVS_KEY_ATTR_ETHERNET 12 -- 4 16
> > * OVS_KEY_ATTR_ETHERTYPE 2 2 4 8 (outer VLAN ethertype)
> > - * OVS_KEY_ATTR_8021Q 4 -- 4 8
> > + * OVS_KEY_ATTR_VLAN 2 2 4 8
> > * OVS_KEY_ATTR_ENCAP 0 -- 4 4 (VLAN encapsulation)
> > * OVS_KEY_ATTR_ETHERTYPE 2 2 4 8 (inner VLAN ethertype)
> > * OVS_KEY_ATTR_IPV6 40 -- 4 44
> > --
>  
> LGTM.
>  
> Acked-by: Pravin B Shelar  

Thanks.  I pushed it.

--Justin






More information about the dev mailing list