batman-adv: use NO_FLAGS define instead of hard-coding 0
Commit Message
The definition NO_FLAGS was introduced to make the code more
readable and shall be used to initialize flag fields.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
aggregation.c | 2 +-
gateway_client.c | 4 ++--
hard-interface.c | 2 +-
send.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
Comments
On Thursday 09 June 2011 17:13:09 Marek Lindner wrote:
> The definition NO_FLAGS was introduced to make the code more
> readable and shall be used to initialize flag fields.
>
> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Acked-by: Sven Eckelmann <sven@narfation.org>
> ---
> aggregation.c | 2 +-
> gateway_client.c | 4 ++--
> hard-interface.c | 2 +-
> send.c | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/aggregation.c b/aggregation.c
> index ef26011..ede0a56 100644
> --- a/aggregation.c
> +++ b/aggregation.c
> @@ -146,7 +146,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 */
> diff --git a/gateway_client.c b/gateway_client.c
> index cf7f95e..24aee56 100644
> --- a/gateway_client.c
> +++ b/gateway_client.c
> @@ -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);
> diff --git a/hard-interface.c b/hard-interface.c
> index cf972c3..db7aacf 100644
> --- a/hard-interface.c
> +++ b/hard-interface.c
> @@ -331,7 +331,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->tt_num_changes = 0;
> diff --git a/send.c b/send.c
> index 0c5d671..a150c7c 100644
> --- a/send.c
> +++ b/send.c
> @@ -334,7 +334,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);
On Thursday, June 09, 2011 05:43:48 PM Sven Eckelmann wrote:
> On Thursday 09 June 2011 17:13:09 Marek Lindner wrote:
> > The definition NO_FLAGS was introduced to make the code more
> > readable and shall be used to initialize flag fields.
> >
> >
> >
> > Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
>
> Acked-by: Sven Eckelmann <sven@narfation.org>
Applied in revision aa33f41.
Thanks,
Marek
@@ -146,7 +146,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 */
@@ -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);
@@ -331,7 +331,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->tt_num_changes = 0;
@@ -334,7 +334,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);