Re: [ovs-dev] [datapath backport v2 01/10] datapath: Always define NF_CT_LABELS_MAX_SIZE

[Andy Zhou]

On Tue, Apr 18, 2017 at 4:05 PM, Joe Stringer  wrote:
> On 14 April 2017 at 16:06, Andy Zhou  wrote:
>> When CONFIG_NF_CONNTRACK_LABLES is not set, upstream code still make
>> use of NF_CT_LABLES_MAX_SIZE. Always define it in the compat code
>> to keep back ports close to the upstream.
>>
>> Signed-off-by: Andy Zhou 
>>
>> ---
>
> Acked-by: Joe Stringer 

Thanks for the review. Pushed the series to master.
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Re: [ovs-dev] [datapath backport v2 01/10] datapath: Always define NF_CT_LABELS_MAX_SIZE

[Joe Stringer]

On 14 April 2017 at 16:06, Andy Zhou  wrote:
> When CONFIG_NF_CONNTRACK_LABLES is not set, upstream code still make
> use of NF_CT_LABLES_MAX_SIZE. Always define it in the compat code
> to keep back ports close to the upstream.
>
> Signed-off-by: Andy Zhou 
>
> ---

Acked-by: Joe Stringer 
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

[ovs-dev] [datapath backport v2 01/10] datapath: Always define NF_CT_LABELS_MAX_SIZE

[Andy Zhou]

When CONFIG_NF_CONNTRACK_LABLES is not set, upstream code still make
use of NF_CT_LABLES_MAX_SIZE. Always define it in the compat code
to keep back ports close to the upstream.

Signed-off-by: Andy Zhou 

---
v1->v2:  Drop the v1, change to always export NF_CT_LABELS_MAX_SIZE
---
 datapath/linux/compat/include/net/netfilter/nf_conntrack_labels.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/datapath/linux/compat/include/net/netfilter/nf_conntrack_labels.h 
b/datapath/linux/compat/include/net/netfilter/nf_conntrack_labels.h
index c138de7bab7a..5af5a9a8db7c 100644
--- a/datapath/linux/compat/include/net/netfilter/nf_conntrack_labels.h
+++ b/datapath/linux/compat/include/net/netfilter/nf_conntrack_labels.h
@@ -5,13 +5,13 @@
 #include 
 #include_next 
 
-#ifndef HAVE_NF_CONNLABELS_GET_TAKES_BIT
-#if IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS)
-
 #ifndef NF_CT_LABELS_MAX_SIZE
 #define NF_CT_LABELS_MAX_SIZE ((XT_CONNLABEL_MAXBIT + 1) / BITS_PER_BYTE)
 #endif
 
+#ifndef HAVE_NF_CONNLABELS_GET_TAKES_BIT
+#if IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS)
+
 /* XXX: This doesn't lock others out from doing the same configuration
  * simultaneously. */
 static inline int rpl_nf_connlabels_get(struct net *net, unsigned int bits)
-- 
1.8.3.1

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev