Netdev List
 help / color / mirror / Atom feed
From: Wang Weidong <wangweidong1@huawei.com>
To: <vyasevich@gmail.com>, <nhorman@tuxdriver.com>
Cc: <davem@davemloft.net>, <dingtianhong@huawei.com>,
	<linux-sctp@vger.kernel.org>, <netdev@vger.kernel.org>
Subject: [PATCH net-next v2 2/4] sctp: remove the else path
Date: Fri, 8 Nov 2013 14:17:49 +0800	[thread overview]
Message-ID: <1383891471-20892-3-git-send-email-wangweidong1@huawei.com> (raw)
In-Reply-To: <1383891471-20892-1-git-send-email-wangweidong1@huawei.com>

Make the code more simplification.

Signed-off-by: Wang Weidong <wangweidong1@huawei.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 667f984..98acb47 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -954,17 +954,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

  parent reply	other threads:[~2013-11-08  6:18 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-08  6:17 [PATCH net-next v2 0/4] sctp: do some clean ups Wang Weidong
2013-11-08  6:17 ` [PATCH net-next v2 1/4] sctp: remove the duplicate initialize Wang Weidong
2013-11-08  6:17 ` Wang Weidong [this message]
2013-11-08  6:17 ` [PATCH net-next v2 3/4] sctp: convert sctp_peer_needs_update to boolean Wang Weidong
2013-11-08  6:17 ` [PATCH net-next v2 4/4] sctp: fix some comments in associola.c Wang Weidong
2013-11-08 12:31 ` [PATCH net-next v2 0/4] sctp: do some clean ups Neil Horman

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=1383891471-20892-3-git-send-email-wangweidong1@huawei.com \
    --to=wangweidong1@huawei.com \
    --cc=davem@davemloft.net \
    --cc=dingtianhong@huawei.com \
    --cc=linux-sctp@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@tuxdriver.com \
    --cc=vyasevich@gmail.com \
    /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