batman-adv: code refactoring - move debug print into tt_local_set_pending

Each tt_local_set_pending is always followed by a bat_dbg invocation. This can
be simplified by moving the bat_dbg() call.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 9be9c41c529b0c14a95473a01f1faf66577705d7..1ff7fbebf92141b27a39c69723df8cd0838d8e53 100644 (file)
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -355,7 +355,7 @@ out:
 
 static void tt_local_set_pending(struct bat_priv *bat_priv,
                                 struct tt_local_entry *tt_local_entry,
-                                uint16_t flags)
+                                uint16_t flags, const char *message)
 {
        tt_local_event(bat_priv, tt_local_entry->common.addr,
                       tt_local_entry->common.flags | flags);
@@ -364,6 +364,9 @@ static void tt_local_set_pending(struct bat_priv *bat_priv,
         * to be kept in the table in order to send it in a full table
         * response issued before the net ttvn increment (consistency check) */
        tt_local_entry->common.flags |= TT_CLIENT_PENDING;
+
+       bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: "
+               "%s\n", tt_local_entry->common.addr, message);
 }
 
 void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr,
@@ -376,10 +379,7 @@ void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr,
                goto out;
 
        tt_local_set_pending(bat_priv, tt_local_entry, TT_CLIENT_DEL |
-                            (roaming ? TT_CLIENT_ROAM : NO_FLAGS));
-
-       bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: "
-               "%s\n", tt_local_entry->common.addr, message);
+                            (roaming ? TT_CLIENT_ROAM : NO_FLAGS), message);
 out:
        if (tt_local_entry)
                tt_local_entry_free_ref(tt_local_entry);
@@ -417,10 +417,7 @@ static void tt_local_purge(struct bat_priv *bat_priv)
                                continue;
 
                        tt_local_set_pending(bat_priv, tt_local_entry,
-                                            TT_CLIENT_DEL);
-                       bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) "
-                               "pending to be removed: timed out\n",
-                               tt_local_entry->common.addr);
+                                            TT_CLIENT_DEL, "timed out");
                }
                spin_unlock_bh(list_lock);
        }