From: wangweidong <wangweidong1@huawei.com>
Date: Fri, 6 Dec 2013 01:36:28 +0000 (+0800)
Subject: sctp: remove the else path
X-Git-Tag: next-20131210~55^2~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b7318d3edb9d961c41c5e7f7e59b563d74d507d;p=karo-tx-linux.git

sctp: remove the else path

Make the code more simplification.

Acked-by: Neil Horman <nhorman@tuxdriver.com>
Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: Wang Weidong <wangweidong1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 85295208deb5..c7172f8ebac2 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -955,17 +955,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);
 }
 
 /*