Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92070015 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "netfilter: Change %p to %pK in debug messages"

parents 8523d8b0 b34397dd

net/netfilter/nf_conntrack_core.c

+9 −9
Original line number Diff line number Diff line
@@ -303,7 +303,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);
@@ -408,7 +408,7 @@ destroy_conntrack(struct nf_conntrack *nfct) 
	struct nf_conn *ct = (struct nf_conn *)nfct;

	const struct nf_conntrack_l4proto *l4proto;



	pr_debug("destroy_conntrack(%p)\n", ct);

	pr_debug("destroy_conntrack(%pK)\n", ct);

	WARN_ON(atomic_read(&nfct->use) != 0);



	if (unlikely(nf_ct_is_template(ct))) {
@@ -434,7 +434,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);

}
@@ -767,7 +767,7 @@ __nf_conntrack_confirm(struct sk_buff *skb) 
	 * confirmed us.

	 */

	WARN_ON(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
@@ -1245,7 +1245,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);
@@ -1331,13 +1331,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;

		}

	}
@@ -1475,7 +1475,7 @@ void nf_conntrack_alter_reply(struct nf_conn *ct, 
	/* Should be unconfirmed, so not in hash table yet */

	WARN_ON(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;