| Message ID | 20170619233041.12551-1-blp@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
On 06/19/2017 04:30 PM, Ben Pfaff wrote: > This wasn't clear before. > > Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2017-June/334271.html > Signed-off-by: Ben Pfaff <blp@ovn.org> > --- > datapath/linux/compat/include/linux/openvswitch.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/datapath/linux/compat/include/linux/openvswitch.h b/datapath/linux/compat/include/linux/openvswitch.h > index 4c88de1d610d..d41b7770790c 100644 > --- a/datapath/linux/compat/include/linux/openvswitch.h > +++ b/datapath/linux/compat/include/linux/openvswitch.h > @@ -365,7 +365,11 @@ enum ovs_key_attr { > OVS_KEY_ATTR_TUNNEL_INFO, /* struct ovs_tunnel_info */ > #endif > > +#ifndef __KERNEL__ > + /* Only used within userspace data path. */ > OVS_KEY_ATTR_PACKET_TYPE, /* be32 packet type */ > +#endif > + > __OVS_KEY_ATTR_MAX > }; > > Acked-by: Greg Rose <gvrose8192@gmail.com>
On Fri, Jun 23, 2017 at 09:17:01AM -0700, Greg Rose wrote: > On 06/19/2017 04:30 PM, Ben Pfaff wrote: > >This wasn't clear before. > > > >Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2017-June/334271.html > >Signed-off-by: Ben Pfaff <blp@ovn.org> > >--- > > datapath/linux/compat/include/linux/openvswitch.h | 4 ++++ > > 1 file changed, 4 insertions(+) > > > >diff --git a/datapath/linux/compat/include/linux/openvswitch.h b/datapath/linux/compat/include/linux/openvswitch.h > >index 4c88de1d610d..d41b7770790c 100644 > >--- a/datapath/linux/compat/include/linux/openvswitch.h > >+++ b/datapath/linux/compat/include/linux/openvswitch.h > >@@ -365,7 +365,11 @@ enum ovs_key_attr { > > OVS_KEY_ATTR_TUNNEL_INFO, /* struct ovs_tunnel_info */ > > #endif > > > >+#ifndef __KERNEL__ > >+ /* Only used within userspace data path. */ > > OVS_KEY_ATTR_PACKET_TYPE, /* be32 packet type */ > >+#endif > >+ > > __OVS_KEY_ATTR_MAX > > }; > > > > > Acked-by: Greg Rose <gvrose8192@gmail.com> Thanks, applied to master.
diff --git a/datapath/linux/compat/include/linux/openvswitch.h b/datapath/linux/compat/include/linux/openvswitch.h index 4c88de1d610d..d41b7770790c 100644 --- a/datapath/linux/compat/include/linux/openvswitch.h +++ b/datapath/linux/compat/include/linux/openvswitch.h @@ -365,7 +365,11 @@ enum ovs_key_attr { OVS_KEY_ATTR_TUNNEL_INFO, /* struct ovs_tunnel_info */ #endif +#ifndef __KERNEL__ + /* Only used within userspace data path. */ OVS_KEY_ATTR_PACKET_TYPE, /* be32 packet type */ +#endif + __OVS_KEY_ATTR_MAX };
This wasn't clear before. Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2017-June/334271.html Signed-off-by: Ben Pfaff <blp@ovn.org> --- datapath/linux/compat/include/linux/openvswitch.h | 4 ++++ 1 file changed, 4 insertions(+)