From patchwork Fri May 11 23:30:08 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: 912271 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="HubIypyc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40jRCh4cY1z9s1R for ; Sat, 12 May 2018 09:30:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751774AbeEKXaX (ORCPT ); Fri, 11 May 2018 19:30:23 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:46864 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750762AbeEKXaV (ORCPT ); Fri, 11 May 2018 19:30:21 -0400 Received: by mail-qt0-f196.google.com with SMTP id m16-v6so9192753qtg.13; Fri, 11 May 2018 16:30:20 -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=QHR5k1IMLIGK3VGXlZfJ88jw9Cqlvq5GUJfhyVbaW1I=; b=HubIypycNBDJrMmgY3H+l/8msd5OX+BX9Gfq+DgvrEpEsMZEwn0U8E9nHyxsWM3GBv T+1keax6wFwb6dqcAQ9Wouwy5WW2mXJxhWEry1vYveDgLhrrC+sgo4nk9bmvk1at/ao8 6jHjrKnnk6992u0mJfcRB6gYEek7Y/qIfwxXpwnUk4K46opgwO8PASHKO1ZYZlIEaER4 FUmNxX1ZoXT7NUQli6DcDO4QbuMjUNSRHPqnXyCfGDR4s3WiDKFyhEnldrBcXG8bgUYq 3RV+DsNC1noDK7zaeytv7ABfSQaCrgLi/T/eoHE3+6g+8ZsZ0zgKR9DCBMa40NkitIkU hjww== 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=QHR5k1IMLIGK3VGXlZfJ88jw9Cqlvq5GUJfhyVbaW1I=; b=nHZowY3gQZFefVHLVBoqWDh9k4Q3VtMzkx/1/26Ctq/QglkPCghZeXgC8nKihoS4+A j+7YnYWVddCLn+DVJPvNeN/xIRyuKKnUdFCx6yN65NOKcnTet8VlSAiWS3t//zW9MaJc EB/y5TAxmBzwZ7csyCyXRYrf14B/Yx9Hy4fLwtswebv+w8YvP6Bpji5M5kMKpJJprZw8 ItVbbKTSfY4BF/edksEql1x+75qMEqqUuuOYIUL/mXDPauEUv39uloet+Tt12rFRHic4 sEKjkOxtFuCS9YZXBvrGlA+armI+QYchVyvP8OngvkdAiiBrc7yiV2H0sbnm6+XiCcjc L26Q== X-Gm-Message-State: ALKqPwc2h53y8pM7ClpfZ5LmTgNWCzSZ/KwIeC1uBkpWSIgDKDNy2F0O TktQhMVy7Pk4icBIZoxZW6A= X-Google-Smtp-Source: AB8JxZqzbgpGEZfyMLYwD86M1Gn+Mm00y6cUeTPLWty4EOGhyaHk+bPU+ZprmGtXbwExWV2l6UtuXA== X-Received: by 2002:a0c:b61f:: with SMTP id f31-v6mr402922qve.103.1526081419061; Fri, 11 May 2018 16:30:19 -0700 (PDT) Received: from localhost.localdomain ([45.4.239.227]) by smtp.gmail.com with ESMTPSA id 42-v6sm3651290qty.78.2018.05.11.16.30.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 May 2018 16:30:18 -0700 (PDT) Received: by localhost.localdomain (Postfix, from userid 1000) id A06A5180C3B; Fri, 11 May 2018 20:30:16 -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 3/3] sctp: checkpatch fixups Date: Fri, 11 May 2018 20:30:08 -0300 Message-Id: <0a3362579929f389bdf41e3ad2dc1325a2df5931.1526078163.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 A collection of fixups from previous patches, left for later to not introduce unnecessary changes while moving code around. Signed-off-by: Marcelo Ricardo Leitner --- net/sctp/outqueue.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index a594d181fa1178c34cf477e13d700f7b37e72e21..9a2fa7d6d68b1d695cd745ed612eb32193f947e0 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c @@ -812,8 +812,7 @@ static void sctp_outq_select_transport(struct sctp_flush_ctx *ctx, if (!new_transport) { if (!sctp_chunk_is_data(chunk)) { - /* - * If we have a prior transport pointer, see if + /* If we have a prior transport pointer, see if * the destination address of the chunk * matches the destination address of the * current transport. If not a match, then @@ -912,8 +911,7 @@ static void sctp_outq_flush_ctrl(struct sctp_flush_ctx *ctx) sctp_outq_select_transport(ctx, chunk); switch (chunk->chunk_hdr->type) { - /* - * 6.10 Bundling + /* 6.10 Bundling * ... * An endpoint MUST NOT bundle INIT, INIT ACK or SHUTDOWN * COMPLETE with any other chunks. [Send them immediately.] @@ -1061,8 +1059,7 @@ static void sctp_outq_flush_data(struct sctp_flush_ctx *ctx, return; } - /* - * RFC 2960 6.1 Transmission of DATA Chunks + /* RFC 2960 6.1 Transmission of DATA Chunks * * C) When the time comes for the sender to transmit, * before sending new DATA chunks, the sender MUST @@ -1101,8 +1098,7 @@ static void sctp_outq_flush_data(struct sctp_flush_ctx *ctx, sctp_outq_select_transport(ctx, chunk); - pr_debug("%s: outq:%p, chunk:%p[%s], tx-tsn:0x%x skb->head:%p " - "skb->users:%d\n", + pr_debug("%s: outq:%p, chunk:%p[%s], tx-tsn:0x%x skb->head:%p skb->users:%d\n", __func__, ctx->q, chunk, chunk && chunk->chunk_hdr ? sctp_cname(SCTP_ST_CHUNK(chunk->chunk_hdr->type)) : "illegal chunk", ntohl(chunk->subh.data_hdr->tsn), @@ -1175,8 +1171,7 @@ static void sctp_outq_flush_transports(struct sctp_flush_ctx *ctx) } } -/* - * Try to flush an outqueue. +/* Try to flush an outqueue. * * Description: Send everything in q which we legally can, subject to * congestion limitations. @@ -1196,8 +1191,7 @@ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) .gfp = gfp, }; - /* - * 6.10 Bundling + /* 6.10 Bundling * ... * When bundling control chunks with DATA chunks, an * endpoint MUST place control chunks first in the outbound @@ -1768,7 +1762,7 @@ static int sctp_acked(struct sctp_sackhdr *sack, __u32 tsn) if (TSN_lte(tsn, ctsn)) goto pass; - /* 3.3.4 Selective Acknowledgement (SACK) (3): + /* 3.3.4 Selective Acknowledgment (SACK) (3): * * Gap Ack Blocks: * These fields contain the Gap Ack Blocks. They are repeated