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

net: ipv4 and ipv6: Convert printk(KERN_DEBUG to pr_debug 



Use the current debugging style and enable dynamic_debug.

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

net/ipv4/ah4.c

+2 −2
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static void ah4_err(struct sk_buff *skb, u32 info) 
			      ah->spi, IPPROTO_AH, AF_INET);

	if (!x)

		return;

	printk(KERN_DEBUG "pmtu discovery on SA AH/%08x/%08x\n",

	pr_debug("pmtu discovery on SA AH/%08x/%08x\n",

		 ntohl(ah->spi), ntohl(iph->daddr));

	xfrm_state_put(x);

}

net/ipv4/arp.c

+5 −4
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ 
 *		Jesper D. Brouer:       Proxy ARP PVLAN RFC 3069 support.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/types.h>

#include <linux/string.h>
@@ -364,8 +366,7 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb) 
	probes -= neigh->parms->ucast_probes;

	if (probes < 0) {

		if (!(neigh->nud_state & NUD_VALID))

			printk(KERN_DEBUG

			       "trying to ucast probe in NUD_INVALID\n");

			pr_debug("trying to ucast probe in NUD_INVALID\n");

		dst_ha = neigh->ha;

		read_lock_bh(&neigh->lock);

	} else {
@@ -452,7 +453,7 @@ static int arp_set_predefined(int addr_hint, unsigned char *haddr, 
{

	switch (addr_hint) {

	case RTN_LOCAL:

		printk(KERN_DEBUG "ARP: arp called for own IP address\n");

		pr_debug("arp called for own IP address\n");

		memcpy(haddr, dev->dev_addr, dev->addr_len);

		return 1;

	case RTN_MULTICAST:
@@ -473,7 +474,7 @@ int arp_find(unsigned char *haddr, struct sk_buff *skb) 
	struct neighbour *n;



	if (!skb_dst(skb)) {

		printk(KERN_DEBUG "arp_find is called with dst==NULL\n");

		pr_debug("arp_find is called with dst==NULL\n");

		kfree_skb(skb);

		return 1;

	}

net/ipv4/devinet.c

+2 −3
Original line number Diff line number Diff line
@@ -217,8 +217,7 @@ void in_dev_finish_destroy(struct in_device *idev) 
	WARN_ON(idev->ifa_list);

	WARN_ON(idev->mc_list);

#ifdef NET_REFCNT_DEBUG

	printk(KERN_DEBUG "in_dev_finish_destroy: %p=%s\n",

	       idev, dev ? dev->name : "NIL");

	pr_debug("%s: %p=%s\n", __func__, idev, dev ? dev->name : "NIL");

#endif

	dev_put(dev);

	if (!idev->dead)
@@ -1174,7 +1173,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, 


	switch (event) {

	case NETDEV_REGISTER:

		printk(KERN_DEBUG "inetdev_event: bug\n");

		pr_debug("%s: bug\n", __func__);

		RCU_INIT_POINTER(dev->ip_ptr, NULL);

		break;

	case NETDEV_UP:

net/ipv4/inet_timewait_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static void __inet_twsk_kill(struct inet_timewait_sock *tw, 


#ifdef SOCK_REFCNT_DEBUG

	if (atomic_read(&tw->tw_refcnt) != 1) {

		printk(KERN_DEBUG "%s timewait_sock %p refcnt=%d\n",

		pr_debug("%s timewait_sock %p refcnt=%d\n",

			 tw->tw_prot->name, tw, atomic_read(&tw->tw_refcnt));

	}

#endif

net/ipv4/route.c

+4 −5
Original line number Diff line number Diff line
@@ -1374,8 +1374,7 @@ void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more) 
			return;

		}

	} else if (!rt)

		printk(KERN_DEBUG "rt_bind_peer(0) @%p\n",

		       __builtin_return_address(0));

		pr_debug("rt_bind_peer(0) @%p\n", __builtin_return_address(0));



	ip_select_fb_ident(iph);

}
@@ -1839,8 +1838,8 @@ static void ipv4_link_failure(struct sk_buff *skb) 


static int ip_rt_bug(struct sk_buff *skb)

{

	printk(KERN_DEBUG "ip_rt_bug: %pI4 -> %pI4, %s\n",

		&ip_hdr(skb)->saddr, &ip_hdr(skb)->daddr,

	pr_debug("%s: %pI4 -> %pI4, %s\n",

		 __func__, &ip_hdr(skb)->saddr, &ip_hdr(skb)->daddr,

		 skb->dev ? skb->dev->name : "?");

	kfree_skb(skb);

	WARN_ON(1);