Merge existing fixes from asoc/for-5.17 into new branch

[linux-block.git] / net / netfilter / nf_conntrack_expect.c

diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index f562eeef42349e6e40f15b056405dd53d9916f1e..96948e98ec53ddaf8e364e3365204fa3301853e9 100644 (file)
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -41,7 +41,7 @@ EXPORT_SYMBOL_GPL(nf_ct_expect_hash);
 unsigned int nf_ct_expect_max __read_mostly;
 
 static struct kmem_cache *nf_ct_expect_cachep __read_mostly;
-static siphash_key_t nf_ct_expect_hashrnd __read_mostly;
+static siphash_aligned_key_t nf_ct_expect_hashrnd;
 
 /* nf_conntrack_expect helper functions */
 void nf_ct_unlink_expect_report(struct nf_conntrack_expect *exp,
@@ -203,12 +203,12 @@ nf_ct_find_expectation(struct net *net,
         * about to invoke ->destroy(), or nf_ct_delete() via timeout
         * or early_drop().
         *
-        * The atomic_inc_not_zero() check tells:  If that fails, we
+        * The refcount_inc_not_zero() check tells:  If that fails, we
         * know that the ct is being destroyed.  If it succeeds, we
         * can be sure the ct cannot disappear underneath.
         */
        if (unlikely(nf_ct_is_dying(exp->master) ||
-                    !atomic_inc_not_zero(&exp->master->ct_general.use)))
+                    !refcount_inc_not_zero(&exp->master->ct_general.use)))
                return NULL;
 
        if (exp->flags & NF_CT_EXPECT_PERMANENT) {