From patchwork Wed Dec 28 11:26:34 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: 709215 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 3tpVp21Z0Wz9t0m for ; Wed, 28 Dec 2016 22:27:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q4MSqCJQ"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751447AbcL1L1d (ORCPT ); Wed, 28 Dec 2016 06:27:33 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:36196 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751427AbcL1L1X (ORCPT ); Wed, 28 Dec 2016 06:27:23 -0500 Received: by mail-qt0-f196.google.com with SMTP id d22so16101588qtd.3; Wed, 28 Dec 2016 03:27:22 -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=M0R+dVtZm2t++fURcpLq3IIeCCwes8brgP128XVgZwU=; b=q4MSqCJQh7ryWVMRRi8JXOY5LCONN7VTKTkooq8P039Kp0sJIacr4nDZuV63QW2XVY qxOo6O2Gy2JFoPyPfAWDktQ7L1Sg3sexrCSlV0OyGTcdORBTu73YRHxnEv0LD+fcvozD d34AclPGjeOGVKRffXvRwJbQMvSsAOQZjVL6KQmi4tUpHNtTC690SoxWxqmEOgNqH8KQ PxyNJijY3jnALhwkARWke3CmAZE0EF9Uo4pKLxtyD9I9BY7affJu5kvMnZazARipLyAz 0MgIgTCaSoCMRst1tsWqzKUTaw/BzKnDp+bnjRv2O/8p+IkwrcyvMTuedEks3VTA1gpY GPOA== 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=M0R+dVtZm2t++fURcpLq3IIeCCwes8brgP128XVgZwU=; b=l0DPpNbaYf9zR255b+WyNGFXHMrlCgAt9rsj91k8uMUs1XLbQnQJid8PKisn1ntxhp Ia+wfkHX5u/LNaF+og2iEz9YY/Nj56E8Eu1K8FAnI60jHDmrvEaFdhy/5khiBe89CWe6 EgJy2W0yxIYBsch8b6DxCUaET/ucT9/uLm8P0XvocplsJCzDGEVUZo8GdkrK9I7KQsoS fZNoYffnw80BHhbfEk1J2XBZD9ANR6VWgtGVuczL7z26SMULY0o20PSLJ8YnRce6DYHY GjAJUus//PU52VJoQmgApE1g0PLryHUHPJ2Ttd+32gLxhyiui+BMeoTX/zJLSeXAEH3Z ECdA== X-Gm-Message-State: AIkVDXJbcvL+81z6TznO1RJh9zKB+WiX+dlQbFiPFCr0Be6W2NfPrrskEo6Trh6MucFrgA== X-Received: by 10.200.46.7 with SMTP id r7mr37468211qta.16.1482924442362; Wed, 28 Dec 2016 03:27:22 -0800 (PST) Received: from localhost.localdomain.com ([2804:7f4:3381:1ed0::1]) by smtp.gmail.com with ESMTPSA id q53sm30590477qtq.0.2016.12.28.03.27.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Dec 2016 03:27:21 -0800 (PST) From: Marcelo Ricardo Leitner To: netdev@vger.kernel.org Cc: linux-sctp@vger.kernel.org, Vlad Yasevich , Neil Horman Subject: [PATCH RESEND net-next 4/5] sctp: remove return value from sctp_packet_init/config Date: Wed, 28 Dec 2016 09:26:34 -0200 Message-Id: <7d9474410d944567be0dc09da373cf3d30713325.1482924092.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 There is no reason to use this cascading. It doesn't add anything. Let's remove it and simplify. Signed-off-by: Marcelo Ricardo Leitner --- include/net/sctp/structs.h | 7 +++---- net/sctp/output.c | 14 +++++--------- net/sctp/sm_statefuns.c | 5 +++-- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 92daabdc007d94a544baa10d278d229e42e40eb3..87d56cc80a3c1d8549b97391245dacc3b6193618 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -722,10 +722,9 @@ struct sctp_packet { ipfragok:1; /* So let ip fragment this packet */ }; -struct sctp_packet *sctp_packet_init(struct sctp_packet *, - struct sctp_transport *, - __u16 sport, __u16 dport); -struct sctp_packet *sctp_packet_config(struct sctp_packet *, __u32 vtag, int); +void sctp_packet_init(struct sctp_packet *, struct sctp_transport *, + __u16 sport, __u16 dport); +void sctp_packet_config(struct sctp_packet *, __u32 vtag, int); sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *, struct sctp_chunk *, int, gfp_t); sctp_xmit_t sctp_packet_append_chunk(struct sctp_packet *, diff --git a/net/sctp/output.c b/net/sctp/output.c index f5320a87341e160d46b1160edf4c38b569e7e79b..07ab5062e541dc663b619a278742425a92002945 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -81,8 +81,8 @@ static void sctp_packet_reset(struct sctp_packet *packet) /* Config a packet. * This appears to be a followup set of initializations. */ -struct sctp_packet *sctp_packet_config(struct sctp_packet *packet, - __u32 vtag, int ecn_capable) +void sctp_packet_config(struct sctp_packet *packet, __u32 vtag, + int ecn_capable) { struct sctp_transport *tp = packet->transport; struct sctp_association *asoc = tp->asoc; @@ -123,14 +123,12 @@ struct sctp_packet *sctp_packet_config(struct sctp_packet *packet, if (chunk) sctp_packet_append_chunk(packet, chunk); } - - return packet; } /* Initialize the packet structure. */ -struct sctp_packet *sctp_packet_init(struct sctp_packet *packet, - struct sctp_transport *transport, - __u16 sport, __u16 dport) +void sctp_packet_init(struct sctp_packet *packet, + struct sctp_transport *transport, + __u16 sport, __u16 dport) { struct sctp_association *asoc = transport->asoc; size_t overhead; @@ -151,8 +149,6 @@ struct sctp_packet *sctp_packet_init(struct sctp_packet *packet, packet->overhead = overhead; sctp_packet_reset(packet); packet->vtag = 0; - - return packet; } /* Free a packet. */ diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index a95915ef9dbabad30f6171f77b26feab61752f36..9a223d5b2314ff166be0446462c33219b7eec1b9 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -6032,8 +6032,9 @@ static struct sctp_packet *sctp_ootb_pkt_new(struct net *net, sctp_transport_route(transport, (union sctp_addr *)&chunk->dest, sctp_sk(net->sctp.ctl_sock)); - packet = sctp_packet_init(&transport->packet, transport, sport, dport); - packet = sctp_packet_config(packet, vtag, 0); + packet = &transport->packet; + sctp_packet_init(packet, transport, sport, dport); + sctp_packet_config(packet, vtag, 0); return packet;