summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwangweidong <wangweidong1@huawei.com>2013-12-06 02:36:28 +0100
committerDavid S. Miller <davem@davemloft.net>2013-12-06 20:54:38 +0100
commit8b7318d3edb9d961c41c5e7f7e59b563d74d507d (patch)
treecaf58065fc4d3e648efe663fc186e375d1663376 /net
parentsctp: remove the duplicate initialize (diff)
downloadlinux-8b7318d3edb9d961c41c5e7f7e59b563d74d507d.tar.xz
linux-8b7318d3edb9d961c41c5e7f7e59b563d74d507d.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/sctp/associola.c10
1 files changed, 3 insertions, 7 deletions
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);
}
/*