From patchwork Tue Dec 27 17:08:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Ricardo Leitner X-Patchwork-Id: 709056 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tp2Sd6NMXz9t2T for ; Wed, 28 Dec 2016 04:10:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QnJxYW4n"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754797AbcL0RKj (ORCPT ); Tue, 27 Dec 2016 12:10:39 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:33605 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753020AbcL0RKe (ORCPT ); Tue, 27 Dec 2016 12:10:34 -0500 Received: by mail-qk0-f195.google.com with SMTP id n21so29294935qka.0; Tue, 27 Dec 2016 09:08:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZytDuisectTalrac/CsbQYb1lhaDwq97g+rOjEXfNp0=; b=QnJxYW4nLdKLWz1YWKRJQrZRdC7APSjZrdZJ8fogDGh21fxDQHg6/lMIS0cKIELpWj ylOaA+QgpwUiZ4ax4NjB+GlU9KKkUYMV4o4jMg+Wkc9kNZEw/DgvC2WF4jLrMXZwUI1A 6vy+waQnGaQR2Go7KqCmm38MY//GiyLPOMSWc7pOy3bNLL9ME14bGnK8nDd4fpRAhC/8 bWrsgyuXCvbBlTWzF4/53KiuzTxe6zRf+WKmLppp6XlUdPJre5/SylpR9jvRcMuaPKfq Nj3KjjAbrp3VCE+aXyU9a4CH5yTMui4Gfo2jOGrc13Fc4khqmAuXgl1iWpyn/ANhbqXd rPMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZytDuisectTalrac/CsbQYb1lhaDwq97g+rOjEXfNp0=; b=mzvoTFCqNEvSIXQEs3xbNgkSSTkLy9ggHPaoBd+oLtWnsM0RNja//766jeV9wSChFt rvshFLA3HRVhCFuXAYJ6Flr7Rp9KNEbO0c9ZwL6fdlgaMkTIJdcKneyQVnX7wrR0F+/2 lmVa262EqCm7Smpdqehzr6uQge/uhZuvpy1DT0Vj1Ae+0yfbJ/G9fVac4UFAe3e2Jo0T OY/tyEDSMDwqOifXgtJCpoEcR8nPhkkzg3WmrCuBD/BmLyprmV/NNYFXedNe4LCj5FXZ vtxmkDHAMzPOjp0lNKY9bpi45YLtemrkDkcO1A3fA0EDCLckCOwAAbqdTOVcjsMQJxhQ KQgw== X-Gm-Message-State: AIkVDXJvvRhRHhUH8MBYl+v7+7jIJn67AR0bXHfYsLFOJj+p/+uwYr61G4e6cWDaMyVlCQ== X-Received: by 10.55.195.65 with SMTP id a62mr31591976qkj.18.1482858535668; Tue, 27 Dec 2016 09:08:55 -0800 (PST) Received: from localhost.localdomain.com ([2804:7f4:3381:1ed0::1]) by smtp.gmail.com with ESMTPSA id c2sm28854454qkg.8.2016.12.27.09.08.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Dec 2016 09:08:54 -0800 (PST) From: Marcelo Ricardo Leitner To: netdev@vger.kernel.org Cc: linux-sctp@vger.kernel.org, Vlad Yasevich , Neil Horman Subject: [PATCH net-next 1/5] sctp: reduce indent level at sctp_sf_tabort_8_4_8 Date: Tue, 27 Dec 2016 15:08:28 -0200 Message-Id: <889763e8337c9ee206957270dd55cc222d64664f.1482857832.git.marcelo.leitner@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Marcelo Ricardo Leitner --- net/sctp/sm_statefuns.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 8ec20a64a3f8055a0c3576627c5ec5dad7e99ca8..32587b1f84e729221965e270607fea7ef93a7430 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -3237,36 +3237,34 @@ static sctp_disposition_t sctp_sf_tabort_8_4_8(struct net *net, struct sctp_chunk *abort; packet = sctp_ootb_pkt_new(net, asoc, chunk); + if (!packet) + return SCTP_DISPOSITION_NOMEM; - if (packet) { - /* Make an ABORT. The T bit will be set if the asoc - * is NULL. - */ - abort = sctp_make_abort(asoc, chunk, 0); - if (!abort) { - sctp_ootb_pkt_free(packet); - return SCTP_DISPOSITION_NOMEM; - } + /* Make an ABORT. The T bit will be set if the asoc + * is NULL. + */ + abort = sctp_make_abort(asoc, chunk, 0); + if (!abort) { + sctp_ootb_pkt_free(packet); + return SCTP_DISPOSITION_NOMEM; + } - /* Reflect vtag if T-Bit is set */ - if (sctp_test_T_bit(abort)) - packet->vtag = ntohl(chunk->sctp_hdr->vtag); + /* Reflect vtag if T-Bit is set */ + if (sctp_test_T_bit(abort)) + packet->vtag = ntohl(chunk->sctp_hdr->vtag); - /* Set the skb to the belonging sock for accounting. */ - abort->skb->sk = ep->base.sk; + /* Set the skb to the belonging sock for accounting. */ + abort->skb->sk = ep->base.sk; - sctp_packet_append_chunk(packet, abort); + sctp_packet_append_chunk(packet, abort); - sctp_add_cmd_sf(commands, SCTP_CMD_SEND_PKT, - SCTP_PACKET(packet)); - - SCTP_INC_STATS(net, SCTP_MIB_OUTCTRLCHUNKS); + sctp_add_cmd_sf(commands, SCTP_CMD_SEND_PKT, + SCTP_PACKET(packet)); - sctp_sf_pdiscard(net, ep, asoc, type, arg, commands); - return SCTP_DISPOSITION_CONSUME; - } + SCTP_INC_STATS(net, SCTP_MIB_OUTCTRLCHUNKS); - return SCTP_DISPOSITION_NOMEM; + sctp_sf_pdiscard(net, ep, asoc, type, arg, commands); + return SCTP_DISPOSITION_CONSUME; } /*