From patchwork Sun Jul 23 01:34:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 792511 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IDL1Zoqu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xFRsY2TNrz9sPs for ; Sun, 23 Jul 2017 11:35:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755287AbdGWBfn (ORCPT ); Sat, 22 Jul 2017 21:35:43 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33695 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755172AbdGWBfm (ORCPT ); Sat, 22 Jul 2017 21:35:42 -0400 Received: by mail-pg0-f67.google.com with SMTP id z1so8491534pgs.0; Sat, 22 Jul 2017 18:35:41 -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 :in-reply-to:references; bh=SVZSgGMxER7Rbx0OMv+Lo3QOD80zPuq7DmZEtUwl/88=; b=IDL1Zoqu7xTOWO2uNypR8XiaUBExNC7dgp+MQa39btoHDLbav7aG/aoDkdneeeH8KC nzvsZLz12vdrptJEInOnEKjffFWZ96M9a0z6RmI5ESl4HDIvtMK2Zd/0r9YFsT9PwHJl 0rSxMgWV0z0CG1ZDK/9+GHOhkBnI3aznW5nM1kEXDKdc4H9XsD/Z/ltUPWPqqb0ZZk24 1z7CB1PKz/xRiUvfM+fSEoKi46/9vvm0mn7haRvu/abDQSE5W6SZMApjxiwcbSz9kKP5 sgf2Po+tcyg2NRcueuuGeK4nDo8d3yw3KTOtXZMC1Gzv8GuVTcAaPQ2EoaYLJE8DHqE+ 7tQg== 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:in-reply-to:references; bh=SVZSgGMxER7Rbx0OMv+Lo3QOD80zPuq7DmZEtUwl/88=; b=tD2fofog0MWFrTW2PjHEF6GufiogJ1acSCbsnwSwMzacPPKfmKDB20n9zz20tq/ozA gQ4wuwCxZOU4fDHSYJBHd8vcpf8vYnt8RTSkMCM17D09FJKj/X2ViJfuGY29Q+p/x6uS 7YFV1VppEw7GEJFp5DgbHSZLB+K8q0g+3b4zEmgnmskHqmFEhOEAQK+sLiaKTQd5tuoP 6DTvQJVQjzvw3A8o0rUVKjamMVy9neOu1xvMwlvJGkFTb1fSVwIq9gS5MOUFKwetWtyM T4Zh6CtpNCptbguy9qXWOkumUt2ETC5TC+agsIwxzKZHlF6mn03fPAk3cx1IxFsZ6yh5 qjXQ== X-Gm-Message-State: AIVw112WDmGkrq0NY9sLLdiWh2vJW1pqvEQBJiwe9wVo3H4u8YRlNyF3 jcnJejfaFSg0EFhRs0o= X-Received: by 10.98.204.22 with SMTP id a22mr11797051pfg.59.1500773741352; Sat, 22 Jul 2017 18:35:41 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id q8sm16695911pfl.89.2017.07.22.18.35.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jul 2017 18:35:40 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: Marcelo Ricardo Leitner , Neil Horman , davem@davemloft.net Subject: [PATCH net-next 07/11] sctp: remove the typedef sctp_sackhdr_t Date: Sun, 23 Jul 2017 09:34:32 +0800 Message-Id: <734295f5625300a5328c19e255dfbbf7d393e48f.1500773578.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <94b6f03745317ab5c57639f2155a5e1503b4dfb3.1500773578.git.lucien.xin@gmail.com> References: <78a33af4a9d7ef7116637943dbd0ae1403d20114.1500773578.git.lucien.xin@gmail.com> <54eca4d5d79aae83b386754b4613edc388521d54.1500773578.git.lucien.xin@gmail.com> <303fa591073b161b9434fa7f81a8d9d119954359.1500773578.git.lucien.xin@gmail.com> <42fb936def0c9ef0522d2e3809c9c07dccb6974f.1500773578.git.lucien.xin@gmail.com> <94b6f03745317ab5c57639f2155a5e1503b4dfb3.1500773578.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch is to remove the typedef sctp_sackhdr_t, and replace with struct sctp_sackhdr in the places where it's using this typedef. Signed-off-by: Xin Long --- include/linux/sctp.h | 6 +++--- include/net/sctp/command.h | 4 ++-- net/sctp/sm_statefuns.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/sctp.h b/include/linux/sctp.h index 8df6ac5..a2e4312 100644 --- a/include/linux/sctp.h +++ b/include/linux/sctp.h @@ -373,17 +373,17 @@ union sctp_sack_variable { __be32 dup; }; -typedef struct sctp_sackhdr { +struct sctp_sackhdr { __be32 cum_tsn_ack; __be32 a_rwnd; __be16 num_gap_ack_blocks; __be16 num_dup_tsns; union sctp_sack_variable variable[0]; -} sctp_sackhdr_t; +}; typedef struct sctp_sack_chunk { struct sctp_chunkhdr chunk_hdr; - sctp_sackhdr_t sack_hdr; + struct sctp_sackhdr sack_hdr; } sctp_sack_chunk_t; diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h index d4679e7..1d5f6ff 100644 --- a/include/net/sctp/command.h +++ b/include/net/sctp/command.h @@ -135,7 +135,7 @@ typedef union { struct sctp_init_chunk *init; struct sctp_ulpevent *ulpevent; struct sctp_packet *packet; - sctp_sackhdr_t *sackh; + struct sctp_sackhdr *sackh; struct sctp_datamsg *msg; } sctp_arg_t; @@ -176,7 +176,7 @@ SCTP_ARG_CONSTRUCTOR(BA, struct sctp_bind_addr *, bp) SCTP_ARG_CONSTRUCTOR(PEER_INIT, struct sctp_init_chunk *, init) SCTP_ARG_CONSTRUCTOR(ULPEVENT, struct sctp_ulpevent *, ulpevent) SCTP_ARG_CONSTRUCTOR(PACKET, struct sctp_packet *, packet) -SCTP_ARG_CONSTRUCTOR(SACKH, sctp_sackhdr_t *, sackh) +SCTP_ARG_CONSTRUCTOR(SACKH, struct sctp_sackhdr *, sackh) SCTP_ARG_CONSTRUCTOR(DATAMSG, struct sctp_datamsg *, msg) static inline sctp_arg_t SCTP_FORCE(void) diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 7f85239..c09dfe6 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -3187,7 +3187,7 @@ sctp_disposition_t sctp_sf_eat_sack_6_2(struct net *net, sctp_cmd_seq_t *commands) { struct sctp_chunk *chunk = arg; - sctp_sackhdr_t *sackh; + struct sctp_sackhdr *sackh; __u32 ctsn; if (!sctp_vtag_verify(chunk, asoc))