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

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

ipv6: addrconf: Use normal debugging style 



Remove local ADBG macro and use netdev_dbg/pr_debug

Miscellanea:

o Remove unnecessary debug message after allocation failure as there
  already is a dump_stack() on the failure paths
o Leave the allocation failure message on snmp6_alloc_dev as there
  is one code path that does not do a dump_stack()

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

net/ipv6/addrconf.c

+8 −20
Original line number Diff line number Diff line
@@ -94,15 +94,6 @@ 
#include <linux/seq_file.h>

#include <linux/export.h>



/* Set to 3 to get tracing... */

#define ACONF_DEBUG 2



#if ACONF_DEBUG >= 3

#define ADBG(fmt, ...) printk(fmt, ##__VA_ARGS__)

#else

#define ADBG(fmt, ...) do { if (0) printk(fmt, ##__VA_ARGS__); } while (0)

#endif



#define	INFINITY_LIFE_TIME	0xFFFFFFFF



#define IPV6_MAX_STRLEN \
@@ -409,9 +400,8 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev) 
	dev_hold(dev);



	if (snmp6_alloc_dev(ndev) < 0) {

		ADBG(KERN_WARNING

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

			__func__, dev->name);

		netdev_dbg(dev, "%s: cannot allocate memory for statistics\n",

			   __func__);

		neigh_parms_release(&nd_tbl, ndev->nd_parms);

		dev_put(dev);

		kfree(ndev);
@@ -419,8 +409,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",

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

			   __func__, dev->name);

		goto err_release;

	}
@@ -984,7 +973,7 @@ static int ipv6_add_addr_hash(struct net_device *dev, struct inet6_ifaddr *ifa) 


	/* Ignore adding duplicate addresses on an interface */

	if (ipv6_chk_same_addr(dev_net(dev), &ifa->addr, dev, hash)) {

		ADBG("ipv6_add_addr: already assigned\n");

		netdev_dbg(dev, "ipv6_add_addr: already assigned\n");

		err = -EEXIST;

	} else {

		hlist_add_head_rcu(&ifa->addr_lst, &inet6_addr_lst[hash]);
@@ -1044,7 +1033,6 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, 


	ifa = kzalloc(sizeof(*ifa), gfp_flags);

	if (!ifa) {

		ADBG("ipv6_add_addr: malloc failed\n");

		err = -ENOBUFS;

		goto out;

	}
@@ -2618,7 +2606,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao) 
	pinfo = (struct prefix_info *) opt;



	if (len < sizeof(struct prefix_info)) {

		ADBG("addrconf: prefix option too short\n");

		netdev_dbg(dev, "addrconf: prefix option too short\n");

		return;

	}
@@ -4446,7 +4434,7 @@ static void addrconf_verify_rtnl(void) 
	if (time_before(next_sched, jiffies + ADDRCONF_TIMER_FUZZ_MAX))

		next_sched = jiffies + ADDRCONF_TIMER_FUZZ_MAX;



	ADBG(KERN_DEBUG "now = %lu, schedule = %lu, rounded schedule = %lu => %lu\n",

	pr_debug("now = %lu, schedule = %lu, rounded schedule = %lu => %lu\n",

		 now, next, next_sec, next_sched);

	mod_delayed_work(addrconf_wq, &addr_chk_work, next_sched - now);

	rcu_read_unlock_bh();