Commit f3213831 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net: ipv6: Standardize prefixes for message logging 



Add #define pr_fmt(fmt) as appropriate.

Add "IPv6: " to appropriate files.

Convert printk(KERN_<LEVEL> to pr_<level> (but not KERN_DEBUG).
Standardize on "%s: " not "%s(): " when emitting __func__.
Use "%s: ", __func__ instead of embedding function name.
Coalesce formats, align arguments.

ADDRCONF output is now prefixed with "IPv6: "

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82251de2

net/ipv6/addrconf.c

+23 −30
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
 *						status etc.

 */



#define pr_fmt(fmt) "IPv6: " fmt



#include <linux/errno.h>

#include <linux/types.h>

#include <linux/kernel.h>
@@ -327,11 +329,11 @@ void in6_dev_finish_destroy(struct inet6_dev *idev) 
	WARN_ON(idev->mc_list != NULL);



#ifdef NET_REFCNT_DEBUG

	printk(KERN_DEBUG "in6_dev_finish_destroy: %s\n", dev ? dev->name : "NIL");

	printk(KERN_DEBUG "%s: %s\n", __func__, dev ? dev->name : "NIL");

#endif

	dev_put(dev);

	if (!idev->dead) {

		pr_warning("Freeing alive inet6 device %p\n", idev);

		pr_warn("Freeing alive inet6 device %p\n", idev);

		return;

	}

	snmp6_free_dev(idev);
@@ -372,7 +374,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev) 


	if (snmp6_alloc_dev(ndev) < 0) {

		ADBG((KERN_WARNING

			"%s(): cannot allocate memory for statistics; dev=%s.\n",

			"%s: cannot allocate memory for statistics; dev=%s.\n",

			__func__, dev->name));

		neigh_parms_release(&nd_tbl, ndev->nd_parms);

		dev_put(dev);
@@ -382,7 +384,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev) 


	if (snmp6_register_dev(ndev) < 0) {

		ADBG((KERN_WARNING

			"%s(): cannot create /proc/net/dev_snmp6/%s\n",

			"%s: cannot create /proc/net/dev_snmp6/%s\n",

			__func__, dev->name));

		neigh_parms_release(&nd_tbl, ndev->nd_parms);

		ndev->dead = 1;
@@ -400,9 +402,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev) 


#if defined(CONFIG_IPV6_SIT) || defined(CONFIG_IPV6_SIT_MODULE)

	if (dev->type == ARPHRD_SIT && (dev->priv_flags & IFF_ISATAP)) {

		printk(KERN_INFO

		       "%s: Disabled Multicast RS\n",

		       dev->name);

		pr_info("%s: Disabled Multicast RS\n", dev->name);

		ndev->cnf.rtr_solicits = 0;

	}

#endif
@@ -551,7 +551,7 @@ void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp) 
		pr_notice("Timer is still running, when freeing ifa=%p\n", ifp);



	if (ifp->state != INET6_IFADDR_STATE_DEAD) {

		pr_warning("Freeing alive inet6 address %p\n", ifp);

		pr_warn("Freeing alive inet6 address %p\n", ifp);

		return;

	}

	dst_release(&ifp->rt->dst);
@@ -841,8 +841,7 @@ retry: 
	in6_dev_hold(idev);

	if (idev->cnf.use_tempaddr <= 0) {

		write_unlock(&idev->lock);

		printk(KERN_INFO

			"ipv6_create_tempaddr(): use_tempaddr is disabled.\n");

		pr_info("%s: use_tempaddr is disabled\n", __func__);

		in6_dev_put(idev);

		ret = -1;

		goto out;
@@ -852,8 +851,8 @@ retry: 
		idev->cnf.use_tempaddr = -1;	/*XXX*/

		spin_unlock_bh(&ifp->lock);

		write_unlock(&idev->lock);

		printk(KERN_WARNING

			"ipv6_create_tempaddr(): regeneration time exceeded. disabled temporary address support.\n");

		pr_warn("%s: regeneration time exceeded - disabled temporary address support\n",

			__func__);

		in6_dev_put(idev);

		ret = -1;

		goto out;
@@ -863,8 +862,8 @@ retry: 
	if (__ipv6_try_regen_rndid(idev, tmpaddr) < 0) {

		spin_unlock_bh(&ifp->lock);

		write_unlock(&idev->lock);

		printk(KERN_WARNING

			"ipv6_create_tempaddr(): regeneration of randomized interface id failed.\n");

		pr_warn("%s: regeneration of randomized interface id failed\n",

			__func__);

		in6_ifa_put(ifp);

		in6_dev_put(idev);

		ret = -1;
@@ -914,8 +913,7 @@ retry: 
	if (!ift || IS_ERR(ift)) {

		in6_ifa_put(ifp);

		in6_dev_put(idev);

		printk(KERN_INFO

			"ipv6_create_tempaddr(): retry temporary address regeneration.\n");

		pr_info("%s: retry temporary address regeneration\n", __func__);

		tmpaddr = &addr;

		write_lock(&idev->lock);

		goto retry;
@@ -1429,7 +1427,7 @@ void addrconf_dad_failure(struct inet6_ifaddr *ifp) 
			/* DAD failed for link-local based on MAC address */

			idev->cnf.disable_ipv6 = 1;



			printk(KERN_INFO "%s: IPv6 being disabled!\n",

			pr_info("%s: IPv6 being disabled!\n",

				ifp->idev->dev->name);

		}

	}
@@ -1660,9 +1658,8 @@ static void ipv6_regen_rndid(unsigned long data) 
		idev->cnf.regen_max_retry * idev->cnf.dad_transmits * idev->nd_parms->retrans_time -

		idev->cnf.max_desync_factor * HZ;

	if (time_before(expires, jiffies)) {

		printk(KERN_WARNING

			"ipv6_regen_rndid(): too short regeneration interval; timer disabled for %s.\n",

			idev->dev->name);

		pr_warn("%s: too short regeneration interval; timer disabled for %s\n",

			__func__, idev->dev->name);

		goto out;

	}
@@ -2507,7 +2504,7 @@ static void addrconf_gre_config(struct net_device *dev) 
	struct inet6_dev *idev;

	struct in6_addr addr;



	pr_info("ipv6: addrconf_gre_config(%s)\n", dev->name);

	pr_info("%s(%s)\n", __func__, dev->name);



	ASSERT_RTNL();
@@ -2599,9 +2596,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, 
		if (event == NETDEV_UP) {

			if (!addrconf_qdisc_ok(dev)) {

				/* device is not ready yet. */

				printk(KERN_INFO

					"ADDRCONF(NETDEV_UP): %s: "

					"link is not ready\n",

				pr_info("ADDRCONF(NETDEV_UP): %s: link is not ready\n",

					dev->name);

				break;

			}
@@ -2626,9 +2621,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, 
				idev->if_flags |= IF_READY;

			}



			printk(KERN_INFO

					"ADDRCONF(NETDEV_CHANGE): %s: "

					"link becomes ready\n",

			pr_info("ADDRCONF(NETDEV_CHANGE): %s: link becomes ready\n",

				dev->name);



			run_pending = 1;
@@ -4757,8 +4750,8 @@ int __init addrconf_init(void) 


	err = ipv6_addr_label_init();

	if (err < 0) {

		printk(KERN_CRIT "IPv6 Addrconf:"

		       " cannot initialize default policy table: %d.\n", err);

		pr_crit("%s: cannot initialize default policy table: %d\n",

			__func__, err);

		goto out;

	}

net/ipv6/addrlabel.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int __net_init ip6addrlbl_net_init(struct net *net) 
	int err = 0;

	int i;



	ADDRLABEL(KERN_DEBUG "%s()\n", __func__);

	ADDRLABEL(KERN_DEBUG "%s\n", __func__);



	for (i = 0; i < ARRAY_SIZE(ip6addrlbl_init_table); i++) {

		int ret = ip6addrlbl_add(net,

net/ipv6/af_inet6.c

+5 −9
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 *      2 of the License, or (at your option) any later version.

 */



#define pr_fmt(fmt) "IPv6: " fmt



#include <linux/module.h>

#include <linux/capability.h>
@@ -612,13 +613,11 @@ out: 
	return ret;



out_permanent:

	printk(KERN_ERR "Attempt to override permanent protocol %d.\n",

	       protocol);

	pr_err("Attempt to override permanent protocol %d\n", protocol);

	goto out;



out_illegal:

	printk(KERN_ERR

	       "Ignoring attempt to register invalid socket type %d.\n",

	pr_err("Ignoring attempt to register invalid socket type %d\n",

	       p->type);

	goto out;

}
@@ -628,8 +627,7 @@ void 
inet6_unregister_protosw(struct inet_protosw *p)

{

	if (INET_PROTOSW_PERMANENT & p->flags) {

		printk(KERN_ERR

		       "Attempt to unregister permanent protocol %d.\n",

		pr_err("Attempt to unregister permanent protocol %d\n",

		       p->protocol);

	} else {

		spin_lock_bh(&inetsw6_lock);
@@ -1067,9 +1065,7 @@ static int __init inet6_init(void) 
		INIT_LIST_HEAD(r);



	if (disable_ipv6_mod) {

		printk(KERN_INFO

		       "IPv6: Loaded, but administratively disabled, "

		       "reboot required to enable\n");

		pr_info("Loaded, but administratively disabled, reboot required to enable\n");

		goto out;

	}

net/ipv6/ah6.c

+9 −7
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
 * 	This file is derived from net/ipv4/ah.c.

 */



#define pr_fmt(fmt) "IPv6: " fmt



#include <crypto/hash.h>

#include <linux/module.h>

#include <linux/slab.h>
@@ -659,7 +661,7 @@ static int ah6_init_state(struct xfrm_state *x) 


	if (aalg_desc->uinfo.auth.icv_fullbits/8 !=

	    crypto_ahash_digestsize(ahash)) {

		printk(KERN_INFO "AH: %s digestsize %u != %hu\n",

		pr_info("AH: %s digestsize %u != %hu\n",

			x->aalg->alg_name, crypto_ahash_digestsize(ahash),

			aalg_desc->uinfo.auth.icv_fullbits/8);

		goto error;
@@ -727,12 +729,12 @@ static const struct inet6_protocol ah6_protocol = { 
static int __init ah6_init(void)

{

	if (xfrm_register_type(&ah6_type, AF_INET6) < 0) {

		printk(KERN_INFO "ipv6 ah init: can't add xfrm type\n");

		pr_info("%s: can't add xfrm type\n", __func__);

		return -EAGAIN;

	}



	if (inet6_add_protocol(&ah6_protocol, IPPROTO_AH) < 0) {

		printk(KERN_INFO "ipv6 ah init: can't add protocol\n");

		pr_info("%s: can't add protocol\n", __func__);

		xfrm_unregister_type(&ah6_type, AF_INET6);

		return -EAGAIN;

	}
@@ -743,10 +745,10 @@ static int __init ah6_init(void) 
static void __exit ah6_fini(void)

{

	if (inet6_del_protocol(&ah6_protocol, IPPROTO_AH) < 0)

		printk(KERN_INFO "ipv6 ah close: can't remove protocol\n");

		pr_info("%s: can't remove protocol\n", __func__);



	if (xfrm_unregister_type(&ah6_type, AF_INET6) < 0)

		printk(KERN_INFO "ipv6 ah close: can't remove xfrm type\n");

		pr_info("%s: can't remove xfrm type\n", __func__);



}

net/ipv6/esp6.c

+6 −4
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
 * 	This file is derived from net/ipv4/esp.c

 */



#define pr_fmt(fmt) "IPv6: " fmt



#include <crypto/aead.h>

#include <crypto/authenc.h>

#include <linux/err.h>
@@ -651,11 +653,11 @@ static const struct inet6_protocol esp6_protocol = { 
static int __init esp6_init(void)

{

	if (xfrm_register_type(&esp6_type, AF_INET6) < 0) {

		printk(KERN_INFO "ipv6 esp init: can't add xfrm type\n");

		pr_info("%s: can't add xfrm type\n", __func__);

		return -EAGAIN;

	}

	if (inet6_add_protocol(&esp6_protocol, IPPROTO_ESP) < 0) {

		printk(KERN_INFO "ipv6 esp init: can't add protocol\n");

		pr_info("%s: can't add protocol\n", __func__);

		xfrm_unregister_type(&esp6_type, AF_INET6);

		return -EAGAIN;

	}
@@ -666,9 +668,9 @@ static int __init esp6_init(void) 
static void __exit esp6_fini(void)

{

	if (inet6_del_protocol(&esp6_protocol, IPPROTO_ESP) < 0)

		printk(KERN_INFO "ipv6 esp close: can't remove protocol\n");

		pr_info("%s: can't remove protocol\n", __func__);

	if (xfrm_unregister_type(&esp6_type, AF_INET6) < 0)

		printk(KERN_INFO "ipv6 esp close: can't remove xfrm type\n");

		pr_info("%s: can't remove xfrm type\n", __func__);

}



module_init(esp6_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE