redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

neighbour: Convert NEIGH_PRINTK to neigh_dbg

Browse source 
Update debugging messages to a more current style.

Emit these debugging messages at KERN_DEBUG instead
of KERN_DEFAULT.

Add and use neigh_dbg(level, fmt, ...) macro
Add dynamic_debug capability via pr_debug
Convert embedded function names to "%s: ", __func__

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2013-04-15 15:17:19 +00:00 committed by David S. Miller
parent 057dad6fcb
commit d5d427cdae
1 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
net/core/neighbour.c
View file

@ -39,21 +39,13 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/log2.h> #include <linux/log2.h>
#define DEBUG
#define NEIGH_DEBUG 1 #define NEIGH_DEBUG 1
#define neigh_dbg(level, fmt, ...) \
#define NEIGH_PRINTK(x...) printk(x) do { \
#define NEIGH_NOPRINTK(x...) do { ; } while(0) if (level <= NEIGH_DEBUG) \
#define NEIGH_PRINTK1 NEIGH_NOPRINTK pr_debug(fmt, ##__VA_ARGS__); \
#define NEIGH_PRINTK2 NEIGH_NOPRINTK } while (0)
#if NEIGH_DEBUG >= 1
#undef NEIGH_PRINTK1
#define NEIGH_PRINTK1 NEIGH_PRINTK
#endif
#if NEIGH_DEBUG >= 2
#undef NEIGH_PRINTK2
#define NEIGH_PRINTK2 NEIGH_PRINTK
#endif
#define PNEIGH_HASHMASK 0xF #define PNEIGH_HASHMASK 0xF
@ -246,7 +238,7 @@ static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *dev)
n->nud_state = NUD_NOARP; n->nud_state = NUD_NOARP;
else else
n->nud_state = NUD_NONE; n->nud_state = NUD_NONE;
NEIGH_PRINTK2("neigh %p is stray.\n", n); neigh_dbg(2, "neigh %p is stray\n", n);
} }
write_unlock(&n->lock); write_unlock(&n->lock);
neigh_cleanup_and_release(n); neigh_cleanup_and_release(n);
@ -542,7 +534,7 @@ struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey,
lockdep_is_held(&tbl->lock))); lockdep_is_held(&tbl->lock)));
rcu_assign_pointer(nht->hash_buckets[hash_val], n); rcu_assign_pointer(nht->hash_buckets[hash_val], n);
write_unlock_bh(&tbl->lock); write_unlock_bh(&tbl->lock);
NEIGH_PRINTK2("neigh %p is created.\n", n); neigh_dbg(2, "neigh %p is created\n", n);
rc = n; rc = n;
out: out:
return rc; return rc;
@ -725,7 +717,7 @@ void neigh_destroy(struct neighbour *neigh)
dev_put(dev); dev_put(dev);
neigh_parms_put(neigh->parms); neigh_parms_put(neigh->parms);
NEIGH_PRINTK2("neigh %p is destroyed.\n", neigh); neigh_dbg(2, "neigh %p is destroyed\n", neigh);
atomic_dec(&neigh->tbl->entries); atomic_dec(&neigh->tbl->entries);
kfree_rcu(neigh, rcu); kfree_rcu(neigh, rcu);
@ -739,7 +731,7 @@ EXPORT_SYMBOL(neigh_destroy);
*/ */
static void neigh_suspect(struct neighbour *neigh) static void neigh_suspect(struct neighbour *neigh)
{ {
NEIGH_PRINTK2("neigh %p is suspected.\n", neigh); neigh_dbg(2, "neigh %p is suspected\n", neigh);
neigh->output = neigh->ops->output; neigh->output = neigh->ops->output;
} }
@ -751,7 +743,7 @@ static void neigh_suspect(struct neighbour *neigh)
*/ */
static void neigh_connect(struct neighbour *neigh) static void neigh_connect(struct neighbour *neigh)
{ {
NEIGH_PRINTK2("neigh %p is connected.\n", neigh); neigh_dbg(2, "neigh %p is connected\n", neigh);
neigh->output = neigh->ops->connected_output; neigh->output = neigh->ops->connected_output;
} }
@ -852,7 +844,7 @@ static void neigh_invalidate(struct neighbour *neigh)
struct sk_buff *skb; struct sk_buff *skb;
NEIGH_CACHE_STAT_INC(neigh->tbl, res_failed); NEIGH_CACHE_STAT_INC(neigh->tbl, res_failed);
NEIGH_PRINTK2("neigh %p is failed.\n", neigh); neigh_dbg(2, "neigh %p is failed\n", neigh);
neigh->updated = jiffies; neigh->updated = jiffies;
/* It is very thin place. report_unreachable is very complicated /* It is very thin place. report_unreachable is very complicated
@ -904,17 +896,17 @@ static void neigh_timer_handler(unsigned long arg)
if (state & NUD_REACHABLE) { if (state & NUD_REACHABLE) {
if (time_before_eq(now, if (time_before_eq(now,
neigh->confirmed + neigh->parms->reachable_time)) { neigh->confirmed + neigh->parms->reachable_time)) {
NEIGH_PRINTK2("neigh %p is still alive.\n", neigh); neigh_dbg(2, "neigh %p is still alive\n", neigh);
next = neigh->confirmed + neigh->parms->reachable_time; next = neigh->confirmed + neigh->parms->reachable_time;
} else if (time_before_eq(now, } else if (time_before_eq(now,
neigh->used + neigh->parms->delay_probe_time)) { neigh->used + neigh->parms->delay_probe_time)) {
NEIGH_PRINTK2("neigh %p is delayed.\n", neigh); neigh_dbg(2, "neigh %p is delayed\n", neigh);
neigh->nud_state = NUD_DELAY; neigh->nud_state = NUD_DELAY;
neigh->updated = jiffies; neigh->updated = jiffies;
neigh_suspect(neigh); neigh_suspect(neigh);
next = now + neigh->parms->delay_probe_time; next = now + neigh->parms->delay_probe_time;
} else { } else {
NEIGH_PRINTK2("neigh %p is suspected.\n", neigh); neigh_dbg(2, "neigh %p is suspected\n", neigh);
neigh->nud_state = NUD_STALE; neigh->nud_state = NUD_STALE;
neigh->updated = jiffies; neigh->updated = jiffies;
neigh_suspect(neigh); neigh_suspect(neigh);
@ -923,14 +915,14 @@ static void neigh_timer_handler(unsigned long arg)
} else if (state & NUD_DELAY) { } else if (state & NUD_DELAY) {
if (time_before_eq(now, if (time_before_eq(now,
neigh->confirmed + neigh->parms->delay_probe_time)) { neigh->confirmed + neigh->parms->delay_probe_time)) {
NEIGH_PRINTK2("neigh %p is now reachable.\n", neigh); neigh_dbg(2, "neigh %p is now reachable\n", neigh);
neigh->nud_state = NUD_REACHABLE; neigh->nud_state = NUD_REACHABLE;
neigh->updated = jiffies; neigh->updated = jiffies;
neigh_connect(neigh); neigh_connect(neigh);
notify = 1; notify = 1;
next = neigh->confirmed + neigh->parms->reachable_time; next = neigh->confirmed + neigh->parms->reachable_time;
} else { } else {
NEIGH_PRINTK2("neigh %p is probed.\n", neigh); neigh_dbg(2, "neigh %p is probed\n", neigh);
neigh->nud_state = NUD_PROBE; neigh->nud_state = NUD_PROBE;
neigh->updated = jiffies; neigh->updated = jiffies;
atomic_set(&neigh->probes, 0); atomic_set(&neigh->probes, 0);
@ -997,7 +989,7 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
return 1; return 1;
} }
} else if (neigh->nud_state & NUD_STALE) { } else if (neigh->nud_state & NUD_STALE) {
NEIGH_PRINTK2("neigh %p is delayed.\n", neigh); neigh_dbg(2, "neigh %p is delayed\n", neigh);
neigh->nud_state = NUD_DELAY; neigh->nud_state = NUD_DELAY;
neigh->updated = jiffies; neigh->updated = jiffies;
neigh_add_timer(neigh, neigh_add_timer(neigh,
@ -1320,8 +1312,7 @@ int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb)
out: out:
return rc; return rc;
discard: discard:
NEIGH_PRINTK1("neigh_resolve_output: dst=%p neigh=%p\n", neigh_dbg(1, "%s: dst=%p neigh=%p\n", __func__, dst, neigh);
dst, neigh);
out_kfree_skb: out_kfree_skb:
rc = -EINVAL; rc = -EINVAL;
kfree_skb(skb); kfree_skb(skb);
@ -1498,7 +1489,7 @@ void neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *parms)
} }
} }
write_unlock_bh(&tbl->lock); write_unlock_bh(&tbl->lock);
NEIGH_PRINTK1("neigh_parms_release: not found\n"); neigh_dbg(1, "%s: not found\n", __func__);
} }
EXPORT_SYMBOL(neigh_parms_release); EXPORT_SYMBOL(neigh_parms_release);