netdev - [PATCH v3 net-next 2/4] sctp: remove the else path

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1386293790-19956-3-git-send-email-wangweidong1@huawei.com>
Date:	Fri, 6 Dec 2013 09:36:28 +0800
From:	Wang Weidong <wangweidong1@...wei.com>
To:	<nhorman@...driver.com>, <vyasevich@...il.com>,
	<davem@...emloft.net>
CC:	<netdev@...r.kernel.org>, <linux-sctp@...r.kernel.org>
Subject: [PATCH v3 net-next 2/4] sctp: remove the else path

Make the code more simplification.

Acked-by: Neil Horman <nhorman@...driver.com>
Suggested-by: Joe Perches <joe@...ches.com>
Signed-off-by: Wang Weidong <wangweidong1@...wei.com>
---
 net/sctp/associola.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 06534fa..ccc7a58 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -956,17 +956,13 @@ int sctp_cmp_addr_exact(const union sctp_addr *ss1,
  */
 struct sctp_chunk *sctp_get_ecne_prepend(struct sctp_association *asoc)
 {
-	struct sctp_chunk *chunk;
+	if (!asoc->need_ecne)
+		return NULL;
 
 	/* Send ECNE if needed.
 	 * Not being able to allocate a chunk here is not deadly.
 	 */
-	if (asoc->need_ecne)
-		chunk = sctp_make_ecne(asoc, asoc->last_ecne_tsn);
-	else
-		chunk = NULL;
-
-	return chunk;
+	return sctp_make_ecne(asoc, asoc->last_ecne_tsn);
 }
 
 /*
-- 
1.7.12


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html