Merge tag 'for-3.5' of git://openrisc.net/jonas/linux

[karo-tx-linux.git] / net / core / neighbour.c

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index fadaa819b854fe100d242ff2231e1a47905328ea..eb09f8bbbf075bcc10f3335198dc8e097c2f9316 100644 (file)
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -15,6 +15,8 @@
  *     Harald Welte            Add neighbour cache statistics like rtstat
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -712,14 +714,13 @@ void neigh_destroy(struct neighbour *neigh)
        NEIGH_CACHE_STAT_INC(neigh->tbl, destroys);
 
        if (!neigh->dead) {
-               printk(KERN_WARNING
-                      "Destroying alive neighbour %p\n", neigh);
+               pr_warn("Destroying alive neighbour %p\n", neigh);
                dump_stack();
                return;
        }
 
        if (neigh_del_timer(neigh))
-               printk(KERN_WARNING "Impossible event.\n");
+               pr_warn("Impossible event\n");
 
        skb_queue_purge(&neigh->arp_queue);
        neigh->arp_queue_len_bytes = 0;
@@ -1554,8 +1555,8 @@ void neigh_table_init(struct neigh_table *tbl)
        write_unlock(&neigh_tbl_lock);
 
        if (unlikely(tmp)) {
-               printk(KERN_ERR "NEIGH: Registering multiple tables for "
-                      "family %d\n", tbl->family);
+               pr_err("Registering multiple tables for family %d\n",
+                      tbl->family);
                dump_stack();
        }
 }
@@ -1571,7 +1572,7 @@ int neigh_table_clear(struct neigh_table *tbl)
        pneigh_queue_purge(&tbl->proxy_queue);
        neigh_ifdown(tbl, NULL);
        if (atomic_read(&tbl->entries))
-               printk(KERN_CRIT "neighbour leakage\n");
+               pr_crit("neighbour leakage\n");
        write_lock(&neigh_tbl_lock);
        for (tp = &neigh_tables; *tp; tp = &(*tp)->next) {
                if (*tp == tbl) {