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 /datapath/conntrack.c | |
| 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 'datapath/conntrack.c')
| -rw-r--r-- | datapath/conntrack.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/datapath/conntrack.c b/datapath/conntrack.c index ec354c3ad..6b8414c36 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -501,8 +501,7 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone, ct = nf_ct_tuplehash_to_ctrack(h); - skb->nfct = &ct->ct_general; - skb->nfctinfo = ovs_ct_get_info(h); + nf_ct_set(skb, ct, ovs_ct_get_info(h)); return ct; } @@ -766,8 +765,7 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key, if (skb_nfct(skb)) nf_conntrack_put(skb_nfct(skb)); nf_conntrack_get(&tmpl->ct_general); - skb->nfct = &tmpl->ct_general; - skb->nfctinfo = IP_CT_NEW; + nf_ct_set(skb, tmpl, IP_CT_NEW); } err = nf_conntrack_in(net, info->family, |