From patchwork Mon May 14 17:35:20 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: 913155 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="MrYgODEp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l7Bw6PC2z9s0W for ; Tue, 15 May 2018 03:35:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753231AbeENRfc (ORCPT ); Mon, 14 May 2018 13:35:32 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:40083 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753129AbeENRfa (ORCPT ); Mon, 14 May 2018 13:35:30 -0400 Received: by mail-qt0-f194.google.com with SMTP id h2-v6so17213455qtp.7; Mon, 14 May 2018 10:35:30 -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=bS/kw7njMdTGka5tmMtfvocWZsfzRMf0KkT4GwV0buc=; b=MrYgODEprOthn6ZdfuPLMqydK4g5zp75O94rzMzJmQKoBTgxGspYxclKRZKnKDeriQ pNUC/VAbPfj1HGzIpTFFxxCuFlhE6JnoWltx9U8L84goP/42rdkdKOcVBmlBlPOwW/WI M64IrkkxpY9xVDnA9a3lYWWYvpWieBSFj4H2+FaIi+HblxdoWj0L4ng0oNK8EEC3rna+ 7/9FkXiOh03dAbYM+J5YmaLiytf43lEoCRtp5XzoBRXvoM9BrQC+TBf6lRitIEFRU4W9 x6DzCGYBIJ60sONa21H/087XNiqJ5glz19HhSg2fuChIEiDGJO7/RMYWT1uCcwJnoKNQ n8kA== 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=bS/kw7njMdTGka5tmMtfvocWZsfzRMf0KkT4GwV0buc=; b=g/UTfrgzumNMhCRU7Zdi/T9smPibFJq495mLDVLolkP5kmFscIjAFJbmoeuWDuOa01 4GNkdbgTpxgElyurhTRA+48zYqbLEPXH8uQLjrX8u808Gg+L9Gt5HZm3Z/GjvN8oMyJ9 LXYQsln4DHZZj3aNrvuDApl4fyUisjsPCZfBAk2zc5VpJVMsTQ34zOYh6w5SNLQ3rWeH ucxXpGWStyyUQfohhSqLWUhn194oiqZFY5aInHo045EaMdYqlRgfgWlAkyf57EjFFmbc m+MK+BJZHmBUrAzih6scadpzTJPFmBokXlu1twWiFmslHb0gOWEdMwdZsA5yPeg4GAF6 sdKg== X-Gm-Message-State: ALKqPwdKOKwDQO8b2hSk8hHK60AVs7vU7kHxikPtgQ39vPdZeD0xFQej fKB8MchY/yN1ulYMVsDpZ2c= X-Google-Smtp-Source: AB8JxZr/xd8LkQXp4B87jy10AEBAoXlfVhLpC0fomuc5dmdcpXyVvbrCW0nSQCB6GpR8AzesGDO1JA== X-Received: by 2002:aed:3c0f:: with SMTP id t15-v6mr9785711qte.398.1526319329445; Mon, 14 May 2018 10:35:29 -0700 (PDT) Received: from localhost.localdomain ([45.4.239.227]) by smtp.gmail.com with ESMTPSA id s11-v6sm8295259qtk.39.2018.05.14.10.35.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 May 2018 10:35:28 -0700 (PDT) Received: by localhost.localdomain (Postfix, from userid 1000) id C69E118147E; Mon, 14 May 2018 14:35:26 -0300 (-03) From: Marcelo Ricardo Leitner To: netdev@vger.kernel.org Cc: linux-sctp@vger.kernel.org, Neil Horman , Xin Long , Vlad Yasevich Subject: [PATCH net-next v3 3/3] sctp: checkpatch fixups Date: Mon, 14 May 2018 14:35:20 -0300 Message-Id: <1532d28423d0c2322f66e5d15de709ef2f574bc8.1526319083.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 68b7baea3feaacf6738a2346501b2ad673b67503..d68aa33485a94e87858fed9b655f00a1b9748998 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