summaryrefslogtreecommitdiffstats
path: root/net/openvswitch/conntrack.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2017-01-23 12:21:56 -0500
committerPablo Neira Ayuso <pablo@netfilter.org>2017-02-02 08:31:53 -0500
commitcb9c68363efb6d1f950ec55fb06e031ee70db5fc (patch)
tree081b7de4d5d3bb069beeaa17328f068686aae810 /net/openvswitch/conntrack.c
parent97a6ad13decc16c5adbf181283932daba7e17faf (diff)
skbuff: add and use skb_nfct helper
Followup patch renames skb->nfct and changes its type so add a helper to avoid intrusive rename change later. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/openvswitch/conntrack.c')
-rw-r--r--net/openvswitch/conntrack.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 6b78bab27755..452557946147 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -721,8 +721,8 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
721 721
722 /* Associate skb with specified zone. */ 722 /* Associate skb with specified zone. */
723 if (tmpl) { 723 if (tmpl) {
724 if (skb->nfct) 724 if (skb_nfct(skb))
725 nf_conntrack_put(skb->nfct); 725 nf_conntrack_put(skb_nfct(skb));
726 nf_conntrack_get(&tmpl->ct_general); 726 nf_conntrack_get(&tmpl->ct_general);
727 skb->nfct = &tmpl->ct_general; 727 skb->nfct = &tmpl->ct_general;
728 skb->nfctinfo = IP_CT_NEW; 728 skb->nfctinfo = IP_CT_NEW;
@@ -819,7 +819,7 @@ static int ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
819 if (err) 819 if (err)
820 return err; 820 return err;
821 821
822 ct = (struct nf_conn *)skb->nfct; 822 ct = (struct nf_conn *)skb_nfct(skb);
823 if (ct) 823 if (ct)
824 nf_ct_deliver_cached_events(ct); 824 nf_ct_deliver_cached_events(ct);
825 } 825 }