Merge "netfilter: Change %p to %pK in debug messages" (5978acf5) · Commits · e / devices / android_kernel_fairphone_FP3

net/netfilter/nf_conntrack_core.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -298,7 +298,7 @@ EXPORT_SYMBOL_GPL(nf_ct_invert_tuple);
		static void
		clean_from_lists(struct nf_conn *ct)
		{
		pr_debug("clean_from_lists(%p)\n", ct);
		pr_debug("clean_from_lists(%pK)\n", ct);
		hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode);
		hlist_nulls_del_rcu(&ct->tuplehash[IP_CT_DIR_REPLY].hnnode);

		@@ -384,7 +384,7 @@ destroy_conntrack(struct nf_conntrack *nfct)
		struct nf_conn ct = (struct nf_conn )nfct;
		struct nf_conntrack_l4proto *l4proto;

		pr_debug("destroy_conntrack(%p)\n", ct);
		pr_debug("destroy_conntrack(%pK)\n", ct);
		NF_CT_ASSERT(atomic_read(&nfct->use) == 0);

		if (unlikely(nf_ct_is_template(ct))) {
		@@ -413,7 +413,7 @@ destroy_conntrack(struct nf_conntrack *nfct)
		if (ct->master)
		nf_ct_put(ct->master);

		pr_debug("destroy_conntrack: returning ct=%p to slab\n", ct);
		pr_debug("destroy_conntrack: returning ct=%pK to slab\n", ct);
		nf_conntrack_free(ct);
		}

		@@ -747,7 +747,7 @@ __nf_conntrack_confirm(struct sk_buff *skb)
		* confirmed us.
		*/
		NF_CT_ASSERT(!nf_ct_is_confirmed(ct));
		pr_debug("Confirming conntrack %p\n", ct);
		pr_debug("Confirming conntrack %pK\n", ct);
		/* We have to check the DYING flag after unlink to prevent
		* a race against nf_ct_get_next_corpse() possibly called from
		* user context, else we insert an already 'dead' hash, blocking
		@@ -1177,7 +1177,7 @@ init_conntrack(struct net net, struct nf_conn tmpl,
		spin_lock(&nf_conntrack_expect_lock);
		exp = nf_ct_find_expectation(net, zone, tuple);
		if (exp) {
		pr_debug("expectation arrives ct=%p exp=%p\n",
		pr_debug("expectation arrives ct=%pK exp=%pK\n",
		ct, exp);
		/* Welcome, Mr. Bond. We've been expecting you... */
		__set_bit(IPS_EXPECTED_BIT, &ct->status);
		@@ -1266,13 +1266,13 @@ resolve_normal_ct(struct net net, struct nf_conn tmpl,
		} else {
		/* Once we've had two way comms, always ESTABLISHED. */
		if (test_bit(IPS_SEEN_REPLY_BIT, &ct->status)) {
		pr_debug("normal packet for %p\n", ct);
		pr_debug("normal packet for %pK\n", ct);
		*ctinfo = IP_CT_ESTABLISHED;
		} else if (test_bit(IPS_EXPECTED_BIT, &ct->status)) {
		pr_debug("related packet for %p\n", ct);
		pr_debug("related packet for %pK\n", ct);
		*ctinfo = IP_CT_RELATED;
		} else {
		pr_debug("new packet for %p\n", ct);
		pr_debug("new packet for %pK\n", ct);
		*ctinfo = IP_CT_NEW;
		}
		*set_reply = 0;
		@@ -1414,7 +1414,7 @@ void nf_conntrack_alter_reply(struct nf_conn *ct,
		/* Should be unconfirmed, so not in hash table yet */
		NF_CT_ASSERT(!nf_ct_is_confirmed(ct));

		pr_debug("Altering reply tuple of %p to ", ct);
		pr_debug("Altering reply tuple of %pK to ", ct);
		nf_ct_dump_tuple(newreply);

		ct->tuplehash[IP_CT_DIR_REPLY].tuple = *newreply;