netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Antonio Quartulli <antonio@meshcoding.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
	Markus Pargmann <mpa@pengutronix.de>,
	Marek Lindner <mareklindner@neomailbox.ch>,
	Antonio Quartulli <antonio@meshcoding.com>
Subject: [PATCH 02/12] batman-adv: iv_ogm_queue_add, Simplify expressions
Date: Wed,  3 Jun 2015 16:13:58 +0200	[thread overview]
Message-ID: <1433340848-1682-3-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1433340848-1682-1-git-send-email-antonio@meshcoding.com>

From: Markus Pargmann <mpa@pengutronix.de>

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
 net/batman-adv/bat_iv_ogm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 190a642..159f30a 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -750,13 +750,13 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv,
 	unsigned long max_aggregation_jiffies;
 
 	batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff;
-	direct_link = batadv_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0;
+	direct_link = !!(batadv_ogm_packet->flags & BATADV_DIRECTLINK);
 	max_aggregation_jiffies = msecs_to_jiffies(BATADV_MAX_AGGREGATION_MS);
 
 	/* find position for the packet in the forward queue */
 	spin_lock_bh(&bat_priv->forw_bat_list_lock);
 	/* own packets are not to be aggregated */
-	if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) {
+	if (atomic_read(&bat_priv->aggregated_ogms) && !own_packet) {
 		hlist_for_each_entry(forw_packet_pos,
 				     &bat_priv->forw_bat_list, list) {
 			if (batadv_iv_ogm_can_aggregate(batadv_ogm_packet,
-- 
2.4.2

  parent reply	other threads:[~2015-06-03 14:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-03 14:13 pull request: batman-adv 20150603 Antonio Quartulli
2015-06-03 14:13 ` [PATCH 01/12] batman-adv: iv_ogm_aggregate_new, simplify error handling Antonio Quartulli
2015-06-03 14:13 ` Antonio Quartulli [this message]
2015-06-03 14:13 ` [PATCH 03/12] batman-adv: iv_ogm_orig_update, style, add missing brackets Antonio Quartulli
2015-06-03 14:14 ` [PATCH 04/12] batman-adv: iv_ogm, Fix dup_status comment Antonio Quartulli
2015-06-03 14:14 ` [PATCH 05/12] batman-adv: iv_ogm, fix coding style Antonio Quartulli
2015-06-03 14:14 ` [PATCH 06/12] batman-adv: iv_ogm, fix comment function name Antonio Quartulli
2015-06-03 14:14 ` [PATCH 07/12] batman-adv: types, Fix comment on bcast_own Antonio Quartulli
2015-06-03 14:14 ` [PATCH 08/12] batman-adv: Remove unnecessary check for orig_ifinfo not NULL Antonio Quartulli
2015-06-03 14:14 ` [PATCH 09/12] batman-adv: main, Convert is_my_mac() to bool Antonio Quartulli
2015-06-03 14:14 ` [PATCH 10/12] batman-adv: main, batadv_compare_eth return bool Antonio Quartulli
2015-06-03 14:14 ` [PATCH 11/12] batman-adv: Remove unnecessary ret variable Antonio Quartulli
2015-06-03 14:14 ` [PATCH 12/12] batman-adv: Remove unnecessary ret variable in algo_register Antonio Quartulli
2015-06-04  3:23 ` pull request: batman-adv 20150603 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1433340848-1682-3-git-send-email-antonio@meshcoding.com \
    --to=antonio@meshcoding.com \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    --cc=davem@davemloft.net \
    --cc=mareklindner@neomailbox.ch \
    --cc=mpa@pengutronix.de \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).