From patchwork Fri May 11 23:28:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Ricardo Leitner X-Patchwork-Id: 912258 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nIfoQSb9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40jR9n6nmDz9s1b for ; Sat, 12 May 2018 09:28:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751386AbeEKX2k (ORCPT ); Fri, 11 May 2018 19:28:40 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:45856 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751345AbeEKX2j (ORCPT ); Fri, 11 May 2018 19:28:39 -0400 Received: by mail-qt0-f195.google.com with SMTP id j42-v6so9190260qtj.12; Fri, 11 May 2018 16:28:38 -0700 (PDT) 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=YyTtGWVy0MEFTb/349RlJa2wplQBDbZzqD+E0Pe00WY=; b=nIfoQSb9NtczWQhIutNQHb7fdDZUABDK+jKA+LGowFQqQb1mYteGPukFTXDV4Ji42N ymu0Qlg8fbVNV+X43ov3ouSyyVgtjF4yOUmT19LpL/+45jIXbpoBwptdMnSXVowZ+nzz kNtTUNM8Bi/hHlTJsc0wNv0jxURefrS3GuzEZhq+w81BqnJmRTkAnfKotQKRwNE0ayL6 n12XQDjLrz1FvXtBX8KQrFiUs2HL8UgucZwynLgy2BjGLKu2bOs183CiEgDDSpZWYxDP SJeXX9VdUB35j9K15auz0xx/oOKRh7bWXFl3SRiDwYwr3HCWEImfCbA0FKNMO405JBbJ nMlg== 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=YyTtGWVy0MEFTb/349RlJa2wplQBDbZzqD+E0Pe00WY=; b=MJaLHqmKSWNRTcqMZuTN75YI8JVIef1VcB85vMjJJASm+YEfydSj8kbHgANHy6p/3X xdzZLDsx8mLjv33qredhcpeosh/6k+jjYXXVwhb8g8txUBG+822zoQBbPJURoKYHuBaM iPgp3frjPQ3sPzHsCFoKNdJocAqWD4lVcrt48tV9nsH14esqM1CqE8WSIjRJq7F1smBi 6EHjd6E6gOqmFxjnB2C17hWd8HDQZPElW34EyBPY6LxgGbku0KIsXZSJ7czw+twx55jO Au46b0sUPkp64m8UieT3E4zwr65odj+Y7Jx+V+W6t9W/aImy8cFRg6wxC+LXsur3oEzu jlrA== X-Gm-Message-State: ALKqPwetzbpYwtpCtQRp9ouPOKMLyV5yNUtrB/lflPkqtipr5zY/z27E sl7aJ1+JnH0KP/o2KjmlnTQ= X-Google-Smtp-Source: AB8JxZr1F97xHoFax3/Lp9BMkBcloW6V3UKQN6LhEz3zZarUKdas+HjTOhbQn3AdgWUw0l/lTG4YYw== X-Received: by 2002:ac8:36d1:: with SMTP id b17-v6mr83156qtc.148.1526081318270; Fri, 11 May 2018 16:28:38 -0700 (PDT) Received: from localhost.localdomain ([45.4.239.227]) by smtp.gmail.com with ESMTPSA id k46-v6sm3616936qta.65.2018.05.11.16.28.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 May 2018 16:28:37 -0700 (PDT) Received: by localhost.localdomain (Postfix, from userid 1000) id 903C6180C3B; Fri, 11 May 2018 20:28:35 -0300 (-03) From: Marcelo Ricardo Leitner To: netdev@vger.kernel.org Cc: linux-sctp@vger.kernel.org, Neil Horman , Vlad Yasevich , Xin Long Subject: [PATCH net-next 1/8] sctp: add sctp_packet_singleton Date: Fri, 11 May 2018 20:28:28 -0300 Message-Id: <3a5891776a3b203d92c22df4794b0828ac92274d.1526077476.git.marcelo.leitner@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Factor out the code for generating singletons. It's used only once, but helps to keep the context contained. The const variables are to ease the reading of subsequent calls in there. Signed-off-by: Marcelo Ricardo Leitner --- net/sctp/outqueue.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index dee7cbd5483149024f2f3195db2fe4d473b1a00a..300bd0dfc7c14c9df579dbe2f9e78dd8356ae1a3 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c @@ -776,6 +776,20 @@ void sctp_outq_uncork(struct sctp_outq *q, gfp_t gfp) sctp_outq_flush(q, 0, gfp); } +static int sctp_packet_singleton(struct sctp_transport *transport, + struct sctp_chunk *chunk, gfp_t gfp) +{ + const struct sctp_association *asoc = transport->asoc; + const __u16 sport = asoc->base.bind_addr.port; + const __u16 dport = asoc->peer.port; + const __u32 vtag = asoc->peer.i.init_tag; + struct sctp_packet singleton; + + sctp_packet_init(&singleton, transport, sport, dport); + sctp_packet_config(&singleton, vtag, 0); + sctp_packet_append_chunk(&singleton, chunk); + return sctp_packet_transmit(&singleton, gfp); +} /* * Try to flush an outqueue. @@ -789,10 +803,7 @@ void sctp_outq_uncork(struct sctp_outq *q, gfp_t gfp) static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) { struct sctp_packet *packet; - struct sctp_packet singleton; struct sctp_association *asoc = q->asoc; - __u16 sport = asoc->base.bind_addr.port; - __u16 dport = asoc->peer.port; __u32 vtag = asoc->peer.i.init_tag; struct sctp_transport *transport = NULL; struct sctp_transport *new_transport; @@ -905,10 +916,7 @@ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) case SCTP_CID_INIT: case SCTP_CID_INIT_ACK: case SCTP_CID_SHUTDOWN_COMPLETE: - sctp_packet_init(&singleton, transport, sport, dport); - sctp_packet_config(&singleton, vtag, 0); - sctp_packet_append_chunk(&singleton, chunk); - error = sctp_packet_transmit(&singleton, gfp); + error = sctp_packet_singleton(transport, chunk, gfp); if (error < 0) { asoc->base.sk->sk_err = -error; return;