aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/arp.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-05-15 10:11:54 -0400
committerDavid S. Miller <davem@davemloft.net>2012-05-16 01:01:03 -0400
commit91df42bedccb919902c7cf7eb876c982ae7f1b1d (patch)
treea941627c25c941b8f26d20d2c214ff2004eae356 /net/ipv4/arp.c
parentf32138319ca6541e65f95f8e17c9cc88ac1baf94 (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/ipv4/arp.c')
-rw-r--r--net/ipv4/arp.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 373b56bf8f49..3e2bf3dedce5 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -73,6 +73,8 @@
73 * Jesper D. Brouer: Proxy ARP PVLAN RFC 3069 support. 73 * Jesper D. Brouer: Proxy ARP PVLAN RFC 3069 support.
74 */ 74 */
75 75
76#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
77
76#include <linux/module.h> 78#include <linux/module.h>
77#include <linux/types.h> 79#include <linux/types.h>
78#include <linux/string.h> 80#include <linux/string.h>
@@ -364,8 +366,7 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
364 probes -= neigh->parms->ucast_probes; 366 probes -= neigh->parms->ucast_probes;
365 if (probes < 0) { 367 if (probes < 0) {
366 if (!(neigh->nud_state & NUD_VALID)) 368 if (!(neigh->nud_state & NUD_VALID))
367 printk(KERN_DEBUG 369 pr_debug("trying to ucast probe in NUD_INVALID\n");
368 "trying to ucast probe in NUD_INVALID\n");
369 dst_ha = neigh->ha; 370 dst_ha = neigh->ha;
370 read_lock_bh(&neigh->lock); 371 read_lock_bh(&neigh->lock);
371 } else { 372 } else {
@@ -452,7 +453,7 @@ static int arp_set_predefined(int addr_hint, unsigned char *haddr,
452{ 453{
453 switch (addr_hint) { 454 switch (addr_hint) {
454 case RTN_LOCAL: 455 case RTN_LOCAL:
455 printk(KERN_DEBUG "ARP: arp called for own IP address\n"); 456 pr_debug("arp called for own IP address\n");
456 memcpy(haddr, dev->dev_addr, dev->addr_len); 457 memcpy(haddr, dev->dev_addr, dev->addr_len);
457 return 1; 458 return 1;
458 case RTN_MULTICAST: 459 case RTN_MULTICAST:
@@ -473,7 +474,7 @@ int arp_find(unsigned char *haddr, struct sk_buff *skb)
473 struct neighbour *n; 474 struct neighbour *n;
474 475
475 if (!skb_dst(skb)) { 476 if (!skb_dst(skb)) {
476 printk(KERN_DEBUG "arp_find is called with dst==NULL\n"); 477 pr_debug("arp_find is called with dst==NULL\n");
477 kfree_skb(skb); 478 kfree_skb(skb);
478 return 1; 479 return 1;
479 } 480 }