Skip to content

Commit

Permalink
batman-adv: code refactoring - move debug print into tt_local_set_pen…
Browse files Browse the repository at this point in the history
…ding

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>
  • Loading branch information
Antonio Quartulli authored and Marek Lindner committed Feb 16, 2012
1 parent c40ed2b commit c566dbb
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions net/batman-adv/translation-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ int tt_local_seq_print_text(struct seq_file *seq, void *offset)

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);
Expand All @@ -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,
Expand All @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit c566dbb

Please sign in to comment.