diff options
| author | Florian Westphal <fw@strlen.de> | 2017-03-08 17:18:22 -0800 |
|---|---|---|
| committer | Jarno Rajahalme <jarno@ovn.org> | 2017-03-08 17:20:37 -0800 |
| commit | dfa791b23ca7b5a7899f3ecdd24c976d30ba5853 (patch) | |
| tree | c589b8d3268c0f16cbe11cb13948126b49c084f0 /acinclude.m4 | |
| parent | d3c313c16b049013bf8e91840d506b9e360436d6 (diff) | |
| download | openvswitch-dfa791b23ca7b5a7899f3ecdd24c976d30ba5853.tar.gz | |
datapath: add and use nf_ct_set helper
Upstream commit:
commit c74454fadd5ea6fc866ffe2c417a0dba56b2bf1c
Author: Florian Westphal <fw@strlen.de>
Date: Mon Jan 23 18:21:57 2017 +0100
netfilter: add and use nf_ct_set helper
Add a helper to assign a nf_conn entry and the ctinfo bits to an sk_buff.
This avoids changing code in followup patch that merges skb->nfct and
skb->nfctinfo into skb->_nfct.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Joe Stringer <joe@ovn.org>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 170303076..55708c237 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -531,6 +531,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_FIND_PARAM_IFELSE([$KSRC/include/net/netfilter/nf_conntrack.h], [nf_ct_get_tuplepr], [struct.net], [OVS_DEFINE([HAVE_NF_CT_GET_TUPLEPR_TAKES_STRUCT_NET])]) + OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack.h], + [nf_ct_set]) OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_zones.h], [nf_ct_zone_init]) OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_labels.h], |