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

Commit 032b7969 authored by Marek Lindner's avatar Marek Lindner
Browse files

batman-adv: convert time_after instances to has_timed_out 



To increase readability the has_timed_out() functions has been introduced.
This patch converts existing time_after() calls to use this wrapper
function (if applicable).
This patch also converts all timeouts to miliseconds to be consistent.

Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
parent ea3d2fd1

net/batman-adv/gateway_client.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -396,7 +396,7 @@ void gw_node_purge(struct bat_priv *bat_priv) 
{

{

	struct gw_node *gw_node, *curr_gw;

	struct gw_node *gw_node, *curr_gw;

	struct hlist_node *node, *node_tmp;

	struct hlist_node *node, *node_tmp;

	unsigned long timeout = 2 * PURGE_TIMEOUT * HZ;

	unsigned long timeout = msecs_to_jiffies(2 * PURGE_TIMEOUT);

	int do_deselect = 0;

	int do_deselect = 0;





	curr_gw = gw_get_selected_gw_node(bat_priv);

	curr_gw = gw_get_selected_gw_node(bat_priv);

net/batman-adv/main.h

+7 −6
Original line number Original line Diff line number Diff line
@@ -41,13 +41,14 @@ 




/* purge originators after time in seconds if no valid packet comes in

/* purge originators after time in seconds if no valid packet comes in

 * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */

 * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */

#define PURGE_TIMEOUT 200

#define PURGE_TIMEOUT 200000 /* 200 seconds */

#define TT_LOCAL_TIMEOUT 3600 /* in seconds */

#define TT_LOCAL_TIMEOUT 3600000 /* in miliseconds */

#define TT_CLIENT_ROAM_TIMEOUT 600

#define TT_CLIENT_ROAM_TIMEOUT 600000 /* in miliseconds */

/* sliding packet range of received originator messages in sequence numbers

/* sliding packet range of received originator messages in sequence numbers

 * (should be a multiple of our word size) */

 * (should be a multiple of our word size) */

#define TQ_LOCAL_WINDOW_SIZE 64

#define TQ_LOCAL_WINDOW_SIZE 64

#define TT_REQUEST_TIMEOUT 3 /* seconds we have to keep pending tt_req */

#define TT_REQUEST_TIMEOUT 3000 /* miliseconds we have to keep

				 * pending tt_req */





#define TQ_GLOBAL_WINDOW_SIZE 5

#define TQ_GLOBAL_WINDOW_SIZE 5

#define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1

#define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1
@@ -56,8 +57,8 @@ 




#define TT_OGM_APPEND_MAX 3 /* number of OGMs sent with the last tt diff */

#define TT_OGM_APPEND_MAX 3 /* number of OGMs sent with the last tt diff */





#define ROAMING_MAX_TIME 20 /* Time in which a client can roam at most

#define ROAMING_MAX_TIME 20000 /* Time in which a client can roam at most

			     * ROAMING_MAX_COUNT times */

				* ROAMING_MAX_COUNT times in miliseconds*/

#define ROAMING_MAX_COUNT 5

#define ROAMING_MAX_COUNT 5





#define NO_FLAGS 0

#define NO_FLAGS 0

net/batman-adv/originator.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -282,8 +282,7 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, 
	hlist_for_each_entry_safe(neigh_node, node, node_tmp,

	hlist_for_each_entry_safe(neigh_node, node, node_tmp,

				  &orig_node->neigh_list, list) {

				  &orig_node->neigh_list, list) {





		if ((time_after(jiffies,

		if ((has_timed_out(neigh_node->last_valid, PURGE_TIMEOUT)) ||

			neigh_node->last_valid + PURGE_TIMEOUT * HZ)) ||

		    (neigh_node->if_incoming->if_status == IF_INACTIVE) ||

		    (neigh_node->if_incoming->if_status == IF_INACTIVE) ||

		    (neigh_node->if_incoming->if_status == IF_NOT_IN_USE) ||

		    (neigh_node->if_incoming->if_status == IF_NOT_IN_USE) ||

		    (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) {

		    (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) {
@@ -327,9 +326,7 @@ static bool purge_orig_node(struct bat_priv *bat_priv, 
{

{

	struct neigh_node *best_neigh_node;

	struct neigh_node *best_neigh_node;





	if (time_after(jiffies,

	if (has_timed_out(orig_node->last_valid, 2 * PURGE_TIMEOUT)) {

		orig_node->last_valid + 2 * PURGE_TIMEOUT * HZ)) {



		bat_dbg(DBG_BATMAN, bat_priv,

		bat_dbg(DBG_BATMAN, bat_priv,

			"Originator timeout: originator %pM, last_valid %lu\n",

			"Originator timeout: originator %pM, last_valid %lu\n",

			orig_node->orig, (orig_node->last_valid / HZ));

			orig_node->orig, (orig_node->last_valid / HZ));
@@ -372,8 +369,8 @@ static void _purge_orig(struct bat_priv *bat_priv) 
				continue;

				continue;

			}

			}





			if (time_after(jiffies, orig_node->last_frag_packet +

			if (has_timed_out(orig_node->last_frag_packet,

						msecs_to_jiffies(FRAG_TIMEOUT)))

					  FRAG_TIMEOUT))

				frag_list_free(&orig_node->frag_list);

				frag_list_free(&orig_node->frag_list);

		}

		}

		spin_unlock_bh(list_lock);

		spin_unlock_bh(list_lock);

net/batman-adv/routing.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -231,8 +231,7 @@ int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, 
{

{

	if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE)

	if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE)

		|| (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {

		|| (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {

		if (time_after(jiffies, *last_reset +

		if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) {

			msecs_to_jiffies(RESET_PROTECTION_MS))) {





			*last_reset = jiffies;

			*last_reset = jiffies;

			bat_dbg(DBG_BATMAN, bat_priv,

			bat_dbg(DBG_BATMAN, bat_priv,

net/batman-adv/soft-interface.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -396,8 +396,8 @@ void softif_neigh_purge(struct bat_priv *bat_priv) 
		hlist_for_each_entry_safe(softif_neigh, node_tmp, node_tmp2,

		hlist_for_each_entry_safe(softif_neigh, node_tmp, node_tmp2,

					  &softif_neigh_vid->softif_neigh_list,

					  &softif_neigh_vid->softif_neigh_list,

					  list) {

					  list) {

			if ((!time_after(jiffies, softif_neigh->last_seen +

			if ((!has_timed_out(softif_neigh->last_seen,

				msecs_to_jiffies(SOFTIF_NEIGH_TIMEOUT))) &&

					   SOFTIF_NEIGH_TIMEOUT)) &&

			    (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE))

			    (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE))

				continue;

				continue;