diff options
author | Joe Perches <joe@perches.com> | 2012-05-15 10:11:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-16 01:01:03 -0400 |
commit | 91df42bedccb919902c7cf7eb876c982ae7f1b1d (patch) | |
tree | a941627c25c941b8f26d20d2c214ff2004eae356 /net/ipv6/addrconf.c | |
parent | f32138319ca6541e65f95f8e17c9cc88ac1baf94 (diff) |
net: ipv4 and ipv6: Convert printk(KERN_DEBUG to pr_debug
Use the current debugging style and enable dynamic_debug.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 707989068555..8ec009c0b2bc 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -329,7 +329,7 @@ void in6_dev_finish_destroy(struct inet6_dev *idev) | |||
329 | WARN_ON(idev->mc_list != NULL); | 329 | WARN_ON(idev->mc_list != NULL); |
330 | 330 | ||
331 | #ifdef NET_REFCNT_DEBUG | 331 | #ifdef NET_REFCNT_DEBUG |
332 | printk(KERN_DEBUG "%s: %s\n", __func__, dev ? dev->name : "NIL"); | 332 | pr_debug("%s: %s\n", __func__, dev ? dev->name : "NIL"); |
333 | #endif | 333 | #endif |
334 | dev_put(dev); | 334 | dev_put(dev); |
335 | if (!idev->dead) { | 335 | if (!idev->dead) { |
@@ -542,7 +542,7 @@ void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp) | |||
542 | WARN_ON(!hlist_unhashed(&ifp->addr_lst)); | 542 | WARN_ON(!hlist_unhashed(&ifp->addr_lst)); |
543 | 543 | ||
544 | #ifdef NET_REFCNT_DEBUG | 544 | #ifdef NET_REFCNT_DEBUG |
545 | printk(KERN_DEBUG "inet6_ifa_finish_destroy\n"); | 545 | pr_debug("%s\n", __func__); |
546 | #endif | 546 | #endif |
547 | 547 | ||
548 | in6_dev_put(ifp->idev); | 548 | in6_dev_put(ifp->idev); |
@@ -2405,7 +2405,7 @@ static void init_loopback(struct net_device *dev) | |||
2405 | ASSERT_RTNL(); | 2405 | ASSERT_RTNL(); |
2406 | 2406 | ||
2407 | if ((idev = ipv6_find_idev(dev)) == NULL) { | 2407 | if ((idev = ipv6_find_idev(dev)) == NULL) { |
2408 | printk(KERN_DEBUG "init loopback: add_dev failed\n"); | 2408 | pr_debug("%s: add_dev failed\n", __func__); |
2409 | return; | 2409 | return; |
2410 | } | 2410 | } |
2411 | 2411 | ||
@@ -2474,7 +2474,7 @@ static void addrconf_sit_config(struct net_device *dev) | |||
2474 | */ | 2474 | */ |
2475 | 2475 | ||
2476 | if ((idev = ipv6_find_idev(dev)) == NULL) { | 2476 | if ((idev = ipv6_find_idev(dev)) == NULL) { |
2477 | printk(KERN_DEBUG "init sit: add_dev failed\n"); | 2477 | pr_debug("%s: add_dev failed\n", __func__); |
2478 | return; | 2478 | return; |
2479 | } | 2479 | } |
2480 | 2480 | ||
@@ -2509,7 +2509,7 @@ static void addrconf_gre_config(struct net_device *dev) | |||
2509 | ASSERT_RTNL(); | 2509 | ASSERT_RTNL(); |
2510 | 2510 | ||
2511 | if ((idev = ipv6_find_idev(dev)) == NULL) { | 2511 | if ((idev = ipv6_find_idev(dev)) == NULL) { |
2512 | printk(KERN_DEBUG "init gre: add_dev failed\n"); | 2512 | pr_debug("%s: add_dev failed\n", __func__); |
2513 | return; | 2513 | return; |
2514 | } | 2514 | } |
2515 | 2515 | ||
@@ -2549,7 +2549,7 @@ static void ip6_tnl_add_linklocal(struct inet6_dev *idev) | |||
2549 | if (!ipv6_inherit_linklocal(idev, link_dev)) | 2549 | if (!ipv6_inherit_linklocal(idev, link_dev)) |
2550 | return; | 2550 | return; |
2551 | } | 2551 | } |
2552 | printk(KERN_DEBUG "init ip6-ip6: add_linklocal failed\n"); | 2552 | pr_debug("init ip6-ip6: add_linklocal failed\n"); |
2553 | } | 2553 | } |
2554 | 2554 | ||
2555 | /* | 2555 | /* |
@@ -2565,7 +2565,7 @@ static void addrconf_ip6_tnl_config(struct net_device *dev) | |||
2565 | 2565 | ||
2566 | idev = addrconf_add_dev(dev); | 2566 | idev = addrconf_add_dev(dev); |
2567 | if (IS_ERR(idev)) { | 2567 | if (IS_ERR(idev)) { |
2568 | printk(KERN_DEBUG "init ip6-ip6: add_dev failed\n"); | 2568 | pr_debug("init ip6-ip6: add_dev failed\n"); |
2569 | return; | 2569 | return; |
2570 | } | 2570 | } |
2571 | ip6_tnl_add_linklocal(idev); | 2571 | ip6_tnl_add_linklocal(idev); |
@@ -2893,8 +2893,7 @@ static void addrconf_rs_timer(unsigned long data) | |||
2893 | * Note: we do not support deprecated "all on-link" | 2893 | * Note: we do not support deprecated "all on-link" |
2894 | * assumption any longer. | 2894 | * assumption any longer. |
2895 | */ | 2895 | */ |
2896 | printk(KERN_DEBUG "%s: no IPv6 routers present\n", | 2896 | pr_debug("%s: no IPv6 routers present\n", idev->dev->name); |
2897 | idev->dev->name); | ||
2898 | } | 2897 | } |
2899 | 2898 | ||
2900 | out: | 2899 | out: |