diff options
author | Florian Westphal | 2017-01-23 18:21:56 +0100 |
---|---|---|
committer | Pablo Neira Ayuso | 2017-02-02 14:31:53 +0100 |
commit | cb9c68363efb6d1f950ec55fb06e031ee70db5fc (patch) | |
tree | 081b7de4d5d3bb069beeaa17328f068686aae810 /net/netfilter/nf_conntrack_core.c | |
parent | netfilter: reduce direct skb->nfct usage (diff) | |
download | kernel-qcow2-linux-cb9c68363efb6d1f950ec55fb06e031ee70db5fc.tar.gz kernel-qcow2-linux-cb9c68363efb6d1f950ec55fb06e031ee70db5fc.tar.xz kernel-qcow2-linux-cb9c68363efb6d1f950ec55fb06e031ee70db5fc.zip |
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/netfilter/nf_conntrack_core.c')
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index adb7af3a4c4c..78aebf0ee6e3 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1357,7 +1357,7 @@ repeat: goto out; } - NF_CT_ASSERT(skb->nfct); + NF_CT_ASSERT(skb_nfct(skb)); /* Decide what timeout policy we want to apply to this flow. */ timeouts = nf_ct_timeout_lookup(net, ct, l4proto); @@ -1528,7 +1528,7 @@ static void nf_conntrack_attach(struct sk_buff *nskb, const struct sk_buff *skb) /* Attach to new skbuff, and increment count */ nskb->nfct = &ct->ct_general; nskb->nfctinfo = ctinfo; - nf_conntrack_get(nskb->nfct); + nf_conntrack_get(skb_nfct(nskb)); } /* Bring out ya dead! */ |