Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c566dbbe authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Marek Lindner
Browse files

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: default avatarAntonio Quartulli <ordex@autistici.org>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
parent c40ed2bf

net/batman-adv/translation-table.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -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,

static void tt_local_set_pending(struct bat_priv *bat_priv,

				 struct tt_local_entry *tt_local_entry,

				 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_event(bat_priv, tt_local_entry->common.addr,

		       tt_local_entry->common.flags | flags);

		       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

	 * to be kept in the table in order to send it in a full table

	 * response issued before the net ttvn increment (consistency check) */

	 * response issued before the net ttvn increment (consistency check) */

	tt_local_entry->common.flags |= TT_CLIENT_PENDING;

	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,

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;

		goto out;





	tt_local_set_pending(bat_priv, tt_local_entry, TT_CLIENT_DEL |

	tt_local_set_pending(bat_priv, tt_local_entry, TT_CLIENT_DEL |

			     (roaming ? TT_CLIENT_ROAM : NO_FLAGS));

			     (roaming ? TT_CLIENT_ROAM : NO_FLAGS), message);



	bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: "

		"%s\n", tt_local_entry->common.addr, message);

out:

out:

	if (tt_local_entry)

	if (tt_local_entry)

		tt_local_entry_free_ref(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;

				continue;





			tt_local_set_pending(bat_priv, tt_local_entry,

			tt_local_set_pending(bat_priv, tt_local_entry,

					     TT_CLIENT_DEL);

					     TT_CLIENT_DEL, "timed out");

			bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) "

				"pending to be removed: timed out\n",

				tt_local_entry->common.addr);

		}

		}

		spin_unlock_bh(list_lock);

		spin_unlock_bh(list_lock);

	}

	}