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,
Antonio Quartulli <antonio@meshcoding.com>,
Marek Lindner <mareklindner@neomailbox.ch>
Subject: [B.A.T.M.A.N.] [PATCH 08/12] batman-adv: Remove unnecessary check for orig_ifinfo not NULL
Date: Wed, 3 Jun 2015 16:14:04 +0200 [thread overview]
Message-ID: <1433340848-1682-9-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1433340848-1682-1-git-send-email-antonio@meshcoding.com>
From: Sven Eckelmann <sven@narfation.org>
orig_ifinfo is dereferenced multiple times in batadv_iv_ogm_update_seqnos
before the check for NULL is done. The function also exists at the
beginning when orig_ifinfo would have been NULL. This makes the check at
the end unnecessary and only confuses the reader/code analyzers.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
net/batman-adv/bat_iv_ogm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 9f83137..4e93d2d 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -1357,8 +1357,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
out:
spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock);
batadv_orig_node_free_ref(orig_node);
- if (orig_ifinfo)
- batadv_orig_ifinfo_free_ref(orig_ifinfo);
+ batadv_orig_ifinfo_free_ref(orig_ifinfo);
return ret;
}
--
2.4.2
next prev parent reply other threads:[~2015-06-03 14:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-03 14:13 [B.A.T.M.A.N.] pull request: batman-adv 20150603 Antonio Quartulli
2015-06-03 14:13 ` [B.A.T.M.A.N.] [PATCH 01/12] batman-adv: iv_ogm_aggregate_new, simplify error handling Antonio Quartulli
2015-06-03 14:13 ` [B.A.T.M.A.N.] [PATCH 02/12] batman-adv: iv_ogm_queue_add, Simplify expressions Antonio Quartulli
2015-06-03 14:13 ` [B.A.T.M.A.N.] [PATCH 03/12] batman-adv: iv_ogm_orig_update, style, add missing brackets Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 04/12] batman-adv: iv_ogm, Fix dup_status comment Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 05/12] batman-adv: iv_ogm, fix coding style Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 06/12] batman-adv: iv_ogm, fix comment function name Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 07/12] batman-adv: types, Fix comment on bcast_own Antonio Quartulli
2015-06-03 14:14 ` Antonio Quartulli [this message]
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 09/12] batman-adv: main, Convert is_my_mac() to bool Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 10/12] batman-adv: main, batadv_compare_eth return bool Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 11/12] batman-adv: Remove unnecessary ret variable Antonio Quartulli
2015-06-03 14:14 ` [B.A.T.M.A.N.] [PATCH 12/12] batman-adv: Remove unnecessary ret variable in algo_register Antonio Quartulli
2015-06-04 3:23 ` [B.A.T.M.A.N.] 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-9-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=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).