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

Commit ecbd5321 authored by Marek Lindner's avatar Marek Lindner Committed by Sven Eckelmann
Browse files

batman-adv: use NO_FLAGS define instead of hard-coding 0 



The definition NO_FLAGS was introduced to make the code more
readable and shall be used to initialize flag fields.

Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent e8958dbf

net/batman-adv/aggregation.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static void new_aggregated_packet(const unsigned char *packet_buff, 
	forw_packet_aggr->own = own_packet;

	forw_packet_aggr->if_incoming = if_incoming;

	forw_packet_aggr->num_packets = 0;

	forw_packet_aggr->direct_link_flags = 0;

	forw_packet_aggr->direct_link_flags = NO_FLAGS;

	forw_packet_aggr->send_time = send_time;



	/* save packet direct link flag status */

net/batman-adv/gateway_client.c

+2 −2
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ void gw_node_update(struct bat_priv *bat_priv, 


		gw_node->deleted = 0;



		if (new_gwflags == 0) {

		if (new_gwflags == NO_FLAGS) {

			gw_node->deleted = jiffies;

			bat_dbg(DBG_BATMAN, bat_priv,

				"Gateway %pM removed from gateway list\n",
@@ -335,7 +335,7 @@ void gw_node_update(struct bat_priv *bat_priv, 
		goto unlock;

	}



	if (new_gwflags == 0)

	if (new_gwflags == NO_FLAGS)

		goto unlock;



	gw_node_add(bat_priv, orig_node, new_gwflags);

net/batman-adv/hard-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface, 
	batman_packet = (struct batman_packet *)(hard_iface->packet_buff);

	batman_packet->packet_type = BAT_PACKET;

	batman_packet->version = COMPAT_VERSION;

	batman_packet->flags = 0;

	batman_packet->flags = NO_FLAGS;

	batman_packet->ttl = 2;

	batman_packet->tq = TQ_MAX_VALUE;

	batman_packet->num_tt = 0;

net/batman-adv/main.h

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1

#define TQ_TOTAL_BIDRECT_LIMIT 1



#define NO_FLAGS 0



#define NUM_WORDS (TQ_LOCAL_WINDOW_SIZE / WORD_BIT_SIZE)



#define LOG_BUF_LEN 8192	  /* has to be a power of 2 */

net/batman-adv/send.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ void schedule_own_packet(struct hard_iface *hard_iface) 
		batman_packet->gw_flags =

				(uint8_t)atomic_read(&bat_priv->gw_bandwidth);

	else

		batman_packet->gw_flags = 0;

		batman_packet->gw_flags = NO_FLAGS;



	atomic_inc(&hard_iface->seqno);